introduce cors_headers
Merge branch 'master' into production