Merged 2 commits from 1.3 to 1.4