merge 39538 32835