Merge branch 'hotfix/1.4.1'
small bugfixes
Merge branch 'hotfix/1.4.2' into develop