[rend-non-BE][split-non-BE] Port float MR 2392 to BASOP main in points where it applies. See merge request !2566