Merge branch 'jc/merge-tag-object' into maint