Merge "Track down Contexts without data directories." into nyc-dev