merge 52719 52667