Merge branch '4_6_x' into 21048