Merge "Add CSRF flag management for devops portal"