Merge branch 'jk/describe-omit-some-refs' into mk/describe-match-with-all