Merged changes from storefront