Merge branch 'hotfix/ssl'
ssl fix
Merge branch 'hotfix/ssl2' into develop