HHH-8966 - Redo the MetadataBuilder process