Merge pull request #24088 from TDT-AG/pr/20240506-net-tools