merge from semi-1_14 branch