Merge branch 'clean-math-3' into 'develop'

Clean math 3 (without float conversion changes)

Closes #486 und #497

See merge request !147
Status Job ID Name Coverage
  External
passed continuous-integration/appveyor/branch