Merge branch 'hotfix/hotfix'
Pagination css fix
Merge branch 'hotfix/hotfix' into develop