Merge branch 'bw/short-ref-strict'