Commit after merge with mapstore_improve