Merge "Update ObjectFactory and ConvertibleTimestamp"