merged cherry-pick