fix https
Merge branch 'hotfix/https'
Merge branch 'master' into develop