Fixed coordinates generated in design mode
Merge commit '34963838c5ac6151564d5ce3f263adb6699035b7'
Merge origin/master