Cherry-picking automation Edit