Merge branch 'master' into release/1.5