[#75228026] Changes to further support products at registration.