Merge branch '20251126_cleanup' into 'main'

Maintenanace after 20251126 cleanup

See merge request !2426