Merge changes with eggsempler/store-equipment