Update the XML configuration generator and builder, related to issue #2594.