Reinstate duplicate entry check for manufacture entries (backport #58004)

fix: reinstate duplicate entry check for manufacture entries (backport #58004)