Merge change from 1.4 branch