Merges recent pagination updates into master