Branch 2.0 for module NodeManager created (as new trunk) from tag NodeManager-1.8-23