update 2.x to 6a4959b