Bug fix: Commits created with cherry-pick should only have one parent commit

Bug fix: Commits created with cherry-pick should only have one parent commit #11520