[non-BE][allow regression] Port 363 - changes from float MR 2197 to BASOP main. See merge request !2456