Merge branch '4_6_x' into 23853