Merge branch 'bw/shortref'