Anishek/DC | #2346 | fixing pagination for the deletion
anishek/dc | #2345 | merging changes from branch to our checkin