Merge branch 'fix-tlsv1.3' into 'develop'