[main] 20251028 consolidated cleanup of MRs 341, 352, 357, 365, 373, 380, 382, 389 See merge request !2475