Merge branch 'backport/1.1-branch-name-change' into 'maint/1.1'