CMS-2387 Template XML serializers