merge 4_6_1 back into 4_6_x