Merge "Optimizing TimeSparseArray#put in case of collisions" into pi-dev