Merge from emiko-1_14 branch: