Fixed exceptions while accessing enum values:
* JPF-196 Fix import of D367444521
* JPF-192 Fix import of D367470356