Merge branch 'cherry-pick-1301b72a' into 'master'