Fix pagination
Merge branch 'MH-780' into dev