cleanup xss
Merge branch 'develop' into release/2.11
version bump