Merge "Remove slices from buffers" into oc-dev