Merge branch 'jn/git-cmd-h-bypass-setup' into next