Release 2.9.6 by Wu Pengfei