Disabled SSL temporary
Merge branch 'local-branch'
Merge remote-tracking branch 'origin/master' into LOCAL