[PATCH conductor 0/1] Upstream pagination fix