fixed conflict from previous cherry-pick