upgrade 0.6.0 and 1.9.10