Merge branch 'jh/update-ref-d-through-symref' into maint