Merge "Don't return error information from console_flush" into integration