Merge branch 'master' into pagination
add pagination summary
Merge branch 'pagination'