Merge "Temporarily enable fine-grained error checking" into nyc-dev