Merge following changes from semi-1_14 branch: