Fix MPS-19383 Some code using java generics is not correctly processed by MPS