moved the cherry pick to be before the merge to master so we pick only the correct commits