Merge branch 'jk/describe-omit-some-refs' into maint