[#61114816] - move tagging into separate library