Merge branch 'fix/1726-user-pagination' into 'develop'