update 2.x to 6a8e40f