split_node_tags: Merge changes in main branch up to r7649.