Fix infinite scroll
Merge branch 'client' into develop