update 2.x to c1a674a