Merge branch 'cherry-pick-44afe4c8' into 'maint/1.1'