Fixing issues with new csrf framework
Merge branch 'master' into develop
Fixing csrf issue