Merge branch 'http-security-warning' into 'develop'