Merge branch 'jn/rebase-cmdline-fix'