Merge branch 'fix/nginx-safari' into 'develop'