Update to r612