Merge "Support parsing timestamp and split parsing out"