Merge branch '2174-non-basop-instructions-and-mismatch-to-float-for-basop-jbm' into 'main'

Resolve "Non-BASOP instructions and mismatch to float for BASOP JBM"

Closes #2174

See merge request !2488