ECMS-4722: Improve NodePathUpgradePlugin