Merge pull request #7288 from illume/upstream-0048-product-error-content