Merge "Allow recovery to return error codes" into nyc-dev