Issue 4919 improve xss expression master