Please include a description of this change and which issue it fixes. If no issue exists yet please include context and what problem it solves.
Wasn't the original issue (also) about TagManager? Guess it would need to be adjusted there too:
Also there are a couple of tests that started failing and needs to be updated