Merge branch 'ssl-opt-regression' into development