Merge "Split out ConvertableTimestamp class"