Merge "bugfix: pagination raise exception when no records returned"