merge Store.scala from master