Float code cleanup across modules See merge request !824
mentioned in issue #1058 (closed)
mentioned in issue #1059 (closed)