i think that for cherry-picks we should not be squashing like that