Port to OCC 6.6