Merge branch 'dev/xss' into develop