Merge branch 'final-release-prep' into 'maint/1.1'