Update to r3254