Initial set of fixes...
Merge branch 'development' into highdpi_fixes