Merge "Migrate bandwidth control to NMS, omit history."