Merge branch 'jk/help-unknown-ref-fix'