Fix for GroceryListDemo: Saving stores working again
Merge branch '2.4'