merge in 4_7_x