Merge branch 'hotfix-2.1.11'
Merge branch 'hotfix-2.1.11'
Merge branch 'hotfix-2.1.11'
Merge branch 'hotfix-2.1.8'
Added second logo to the left of the login screen
Merge branch 'hotfix-2.1.12' into develop