Client event ordering fix/3.4 rc1