Merge branch 'mz/cherry-pick-cmdline-order' into maint