Backport fix for default value failure in metadata types with lookup values