Adds pluggable custom tags
Merge remote-tracking branch 'upstream/pluggableTags'