Merge branch 'hotfix/1.2.3'
No cmd.php anymore
Merge branch 'hotfix/1.2.4' into develop