Merge branch 'sk/tag-contains-wo-recursion'