update 2.x_n to e479a6b