Update to r1597 on branch r1547.