Merge "Rebind managed services more" into nyc-dev