Merge branch 'release-1.5'