Updated to latest NGP
Merge branch 'hotfix-5.0.2' into support-5.0