update 2.x to 40d30e2