Merge branch 'hotfix-3'
Merge branch 'development'
Users should be happy.
Merge branch '1.0/hotfix/dft-make-users-happy'
Should minimize my code size! It is SO IMPORTANT!
Merge branch '1.0/hotfix/dft-minimize-code-size' into development