Merge branch 'jk/symbolic-ref-maint' into maint