Synch with the semi-1_14 branch.