Merge branch 'xss-activation' into 5.3