Update to rev 1688