Float editing bug
Merge branch 'hotfix-1.9.7'