Merge "New mode_info_context storage -- undo revert"