Merge branch 'jg/tag-contains'