Merge branch 'jk/symbolic-ref-short' into next