Major: Upgrade source code from product-catalog project.