LPS-44683 Better collection utilties generic support
LPS-44683 SF
LPS-43940 SF