Pull fix from branch_1_1, so proxied EAP replies work