Merge branch 'so/cherry-pick-always-allow-m1'