Merge branch 'mh/deref-symref-over-helper-transport' into maint