master: Initial Import of CSRF