Merge change 801

* changes:
  Pick up fix in npruntime.cpp.