Merge "REST error codes"