Merge branch 'bugfix/int-overflow' into develop
Fix float casting bug
Merge branch 'bugfix/float-casting' into feature/lazy-queries