Merge "Dump local source, not remote" into nyc-dev