Sync Product Fixture with develop branch