Updated NGP
Merge branch 'hotfix-4.5.4' into support-4.5