Merge branch 'chore/maint-1.1-1.1.0-rc2' into 'maint/1.1'