WL-2123 uce generics for comparator
WL-2123 use trimpath expression modifier