Update to r1688