issue with pagination initialization
Merge branch 'hotfixes' into develop