Merge branch 'jn/show-normalized-refs'