Port MR2290 from float - Cleanup 20251014 Closes #2229 See merge request !2594
mentioned in issue #1872