Issue #2060587 by hswong3i: Split uuid_features_file_*_types as entity type specific (Part2).