Merge remote-tracking branch 'ms/xss' into next