Merge "bug fix mode_info_context not initialized for error-resilient"