Merge "Restore ResponseCodes for use with getLastError"