Merge branch 'ssl-fixes' into production