update 2.x to 779244c