Merge "Remove support for auto-paging of cursors." into oc-dev