Merge branch 'cherry-pick-9c64a257' into 'maint/1.1'