Update for 0.8.0-RC.6