Merge branch 'vv/help-unknown-ref' into maint