Only set timestamps if timestamp is in pivot on existing pivots.
Merge branch '4.0'