[non-BE][split-non-BE][allow-regression] Port changes from PC float MR 1292 on top of main-pc See merge request !1418