update 2.x to af2b4b1