Merge branch 'hotfix-2.3.7' into develop
Changes to the installation
Merge branch 'hotfix-2.3.8'