Merge "Fix HC2VPP nodes"