initial cherry-pick
address review comment