Fixing issue with comments pagination
Merge branch 'develop'