Merge branch 'jk/maint-fetch-ref-hier' into maint