LPS-44683 Better collection utilties generic support