yes. we cherry pick things that are on master into branches off of master