Update to r655