Merged 1.4.0 branch to master