changes after pull to opm/opm-core