Merge branch '1642_basop_cleanup' into 'main'

Port MR 1560 from float to main

Closes #1642

See merge request !2024