[SPRINTFIX][#68681988] Updated to handle adhoc products.