Update to r4529