Merge branch 'enhancement/products-in-list' into develop