LPS-47093
LPS-47428 XSS
LPS-47460
Merge remote-tracking branch 'security/6.2.1-cumulative' into 6.2.1-ga2-patched