Merge "Switch from TimePoint to UnixEpochTime"