[#68681988] Fixed merge conflicts with new adhoc products code.