Merge branch '1886_basop_tcxCrash' into 'main'

Port MR2164 from float to main

Closes #1886

See merge request !2028