[non-BE] [Rend non-BE] [split non be] [allow-regression] port mr1848 from float to main Closes #1897 See merge request !2086