Merge branch 'release/1.1.2' into develop