Merge "don't call other services in dump" into nyc-dev