Added cherry-pick support
Added cherry pick tests