Merge changes from 1.4: