Merge branch 'product-specs-characteristics-listing' into 38-implement-product-specification-characteristics-listing
