Merge "Guarding collisions in TimeSparseArray" into pi-dev