Fixed conflict after cherry-pick