[MOD] removing XXX from tags

Merged Ignacio Goitea requested to merge 11.0-MOD-tags-by-removing-XXX into 11.0-stage Dec 04, 2019