Update to Calcite from Optiq