Merge branch 'release/v1.1.1'