Merge canges from 1.4 branch