Update to rc7