Merge branch 'r/1.1.4' into develop
Version bump
Merge branch 'r/1.1.5'