ECMS-6278: Use nodePath instead of UUID