Merge "Spell NodeSet consistently" into feature/zuulv3