cherry-pick 3452 has been merged