Merged my changes from 1.4