Fix float casting bug
Merge branch 'bugfix/float-casting' into develop