HCOLL-197 reworeded Oversized Entries Support