Minor: Remove UUID validate for product change.
Merge master into next