Merge "PayloadLoggingServletFilter update"