merge 39527 36508