* =htc don't encode known to be empty entities (#21393) * =htc added missing headers in the improved marshaller (#21393)