add initial support for cherry-picking changes