Merge branch 'release/1.11'