Merge pull request #24146 from TDT-AG/pr/20240513-rust