Merge branch 'jc/merge-tag-object'