Fixed conflict in cherry-pick