Merge for release-1.4 to master