Merge branch 'jk/symbolic-ref-maint'