Merge "Replace hidden NMS interface to network API"