Merge "C2Config: correct declaration of tunnel-peek mode"