Update to r4391