Merging changes from 1.4 branch