Merge pull request #7056 from TDT-AG/pr/20240411-ucitrack