Merge r51046-r51048