Back to default pagination, no template
Merge from HEAD