merging 4_7_x forward