Merge "Fixed potentional NPE in generateTypesFromChoiceCases"