update 2.x to 1260477