Merge branch 'release/1.1.5'