Merge branch 'jc/tag-contains-with'