Update to r6 branch