CSRF token with customisation
Bugfix for CSRF field when combining with EAV attributes
Merge remote-tracking branch 'origin/master/chiba2' into master/dubrovka