WIP: Added cherry-pick support
WIP: Added cherry pick tests