Merge "Increase poll max size, avoid performance issue when batching" into oc-dev