Backport by git cherry-pick -x d3329f0599f5fdfc2ef9f2c1395b5eb7bcc3c2a5
git cherry-pick -x d3329f0599f5fdfc2ef9f2c1395b5eb7bcc3c2a5