Fix cherry-pick merge bugs
2 files changed