update 2.x to ed1cd11