update 2.x to a45b0b6