Merge branch 'jc/deref-tag' into maint