7 Commits (Fixing-CORS-crash)