Merge "Allow more buffers to work around timing issues" into oc-mr1-dev