Update to rc.6.1