Merge branch 'ah/show-ref-usage-string'