Merge branch 'hotfix-1'
Terrible mistake! This is not JS.
Tests failed, probably overflow.
Revert 2 commits (by hands with tortiose)
Merge branch 'hotfix-2' into development