Merge branch 'Ericsson/TD-renderer-ITD-improvement-and-cleanup' into 'main'

[Non-BE] [Renderer Non-BE] 0016: TD renderer ITD improvement and cleanup

See merge request !261