acu157027 - Refine communication mode handling