Merge commit 'v1.7.2-rc0~6^2' into cc/cherry-pick-stdin