Share tags2

Supersedes #11351.
What about using the mapper for this and the above stuff?