Merge "TIF: Separate service connection errors from recording errors" into nyc-dev