[COOK-3025] Fixes to shoddy rebase effort