fix on pagination
Merge branch 'master/chiba' into dev