Merge branch 'release/2.0.7' into develop
Fix pagination
Update version
Merge branch 'release/2.0.8'