cleanup xss
Merge branch 'release/12.0' into develop