merge 53616 52943