Revert CubelibDatasource to 2.5 and added fixed to Taric error when saving