cherry-pick b9151ca