[Product] Add missing changes after rebase
Merge pull request #2074 from stloyd/bugfix/api_product

[Product] Add missing changes after rebase