Merge branch 'cleanup_20260317' into 'main'

Acceptance of switches 20260318

See merge request !2559