Upgrade 0.6 to 1.3.26