[non-BE] fix for issue 1891, float porting of mr 2048 See merge request !2039
mentioned in issue #1942 (closed)