Fix support for TAE

Rosen Matevrequested to merge
rm-tae into master

Improved version of the original MR !4455 (merged)

Includes !4868 (merged), so it needs rebasing

Merge request reports