NXP-14016: add explicit generic types, not inferred correctly during GWT 2.4.0 compilation