merge 52754 52698