split_node_tags: Merge changes from main branch.