Update to 8.0.0.Final