cherry pick 7e682052 fixes unable to duplicate product