update 2.x to edc5b1d