Merge branch 'fix-nginx-caching' into 'develop'