Bug 451598 - Provide support for TAG_variant and TAG_variant_part