Merge request from TTF_T041 to main

Bostjan Pintarrequested to merge
TTF_T041 into main

Code done under TTF_T041 need to be moved under main

Merge request reports