OGM-428 Cooking generics the way also IntelliJ likes them
OGM-428 Improving documentation