Merge "Change node 'image' to 'label'" into feature/zuulv3