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