Merge new changes into 4_6_x.