Merge branch 'cherry-pick-7c9b023a' into 'maint/1.1'