Merge "FTL: Extend enum utilities imported from IF"