cherry-pick 3911 merged