Cherry-pick from commit of2b03992d