update 2.x to b70376f