Merge branch '20251021-cleanup-main' into 'main'

[main] Cleanup 20251021 - consolidated cleanup of MRs 228, 241, 252, 262, 277

See merge request !2428