Merge branch '20250817_cleanup_basop' into 'main'

[non-be] [allow-regression] Clean-up of ivas-basop

See merge request !2096