Merge "Add class that enables CSRF security"