Fixes: U4-3814 - 6.1.6 XSS vulnerability in backoffice
Merge pull request #268 from james-melville/6.2.0

Fixes: U4-3814 - 6.1.6 XSS vulnerability in backoffice