Update to 3.0-b9