cleanup xss
Merge branch 'release/2.11' into develop