Sample_products_auth is modified
Sampel_product_auth conflict resolved
Merge branch 'fix-sample_products_auth'