Merge "Request more documents when EXTRA_HAS_MORE." into klp-dev