Merging in XML text-tail & custom tags discussion cases