merge 52672 53011