Merge "Update secondary timestamp" into main