Fixed Core-431: Merge XStream configuration in a single method