Merge "Fix 055-enum-performance." into mnc-dr-enso-dev