Merge branch 'hotfix/server_types'
Merge branch 'develop'