Upgrade to r1.2