Core-1667 added pagination support