Fixes csrf issue
Merge branch '6.1.6-U4-3619' into 6.2.0