Merge pull request #701 from joaopapereira/move-tag-mechanism-out-of-…

Merge pull request #701 from joaopapereira/move-tag-mechanism-out-of-… #1788