Merge branch 'new_paginator'