Added pagination collection
Merge branch 'dev'