Merge branch '4_7_1' into 18683