Merge branch 'release/2.0.4.0'
Merge branch 'release/2.0.4.1'
Minor bugfixes
Merge branch 'hotfix/2.0.4.2' into develop