Today
Merge from vertical_storage_test