Merge branch 'feature/oci_offset' into 3.0-stable