Merge "Fixed possible null point exception in node manager entries update code"