From d53572014acc0a5c5369467d5cfa248aa39f2714 Mon Sep 17 00:00:00 2001
From: George Fu <georgfu@amazon.com>
Date: Fri, 8 Apr 2022 14:49:30 -0400
Subject: [PATCH 1/2] feat(types): add pagination stopOnSameToken option

---
 .../src/pagination/ListAccessPreviewFindingsPaginator.ts  | 3 ++-
 .../src/pagination/ListAccessPreviewsPaginator.ts         | 3 ++-
 .../src/pagination/ListAnalyzedResourcesPaginator.ts      | 3 ++-
 .../src/pagination/ListAnalyzersPaginator.ts              | 3 ++-
 .../src/pagination/ListArchiveRulesPaginator.ts           | 3 ++-
 .../src/pagination/ListFindingsPaginator.ts               | 3 ++-
 .../src/pagination/ListPolicyGenerationsPaginator.ts      | 3 ++-
 .../src/pagination/ValidatePolicyPaginator.ts             | 3 ++-
 .../src/pagination/ListCertificateAuthoritiesPaginator.ts | 3 ++-
 .../src/pagination/ListPermissionsPaginator.ts            | 3 ++-
 .../client-acm-pca/src/pagination/ListTagsPaginator.ts    | 3 ++-
 .../src/pagination/ListCertificatesPaginator.ts           | 3 ++-
 .../pagination/ListBusinessReportSchedulesPaginator.ts    | 3 ++-
 .../src/pagination/ListConferenceProvidersPaginator.ts    | 3 ++-
 .../src/pagination/ListDeviceEventsPaginator.ts           | 3 ++-
 .../src/pagination/ListGatewayGroupsPaginator.ts          | 3 ++-
 .../src/pagination/ListGatewaysPaginator.ts               | 3 ++-
 .../src/pagination/ListSkillsPaginator.ts                 | 3 ++-
 .../src/pagination/ListSkillsStoreCategoriesPaginator.ts  | 3 ++-
 .../ListSkillsStoreSkillsByCategoryPaginator.ts           | 3 ++-
 .../src/pagination/ListSmartHomeAppliancesPaginator.ts    | 3 ++-
 .../src/pagination/ListTagsPaginator.ts                   | 3 ++-
 .../src/pagination/SearchAddressBooksPaginator.ts         | 3 ++-
 .../src/pagination/SearchContactsPaginator.ts             | 3 ++-
 .../src/pagination/SearchDevicesPaginator.ts              | 3 ++-
 .../src/pagination/SearchNetworkProfilesPaginator.ts      | 3 ++-
 .../src/pagination/SearchProfilesPaginator.ts             | 3 ++-
 .../src/pagination/SearchRoomsPaginator.ts                | 3 ++-
 .../src/pagination/SearchSkillGroupsPaginator.ts          | 3 ++-
 .../src/pagination/SearchUsersPaginator.ts                | 3 ++-
 .../src/pagination/ListRuleGroupsNamespacesPaginator.ts   | 3 ++-
 .../client-amp/src/pagination/ListWorkspacesPaginator.ts  | 3 ++-
 .../src/pagination/ExportComponentsPaginator.ts           | 3 ++-
 .../src/pagination/ExportThemesPaginator.ts               | 3 ++-
 .../src/pagination/ListComponentsPaginator.ts             | 3 ++-
 .../src/pagination/ListThemesPaginator.ts                 | 3 ++-
 .../src/pagination/GetApiKeysPaginator.ts                 | 3 ++-
 .../src/pagination/GetBasePathMappingsPaginator.ts        | 3 ++-
 .../src/pagination/GetClientCertificatesPaginator.ts      | 3 ++-
 .../src/pagination/GetDeploymentsPaginator.ts             | 3 ++-
 .../src/pagination/GetDomainNamesPaginator.ts             | 3 ++-
 .../src/pagination/GetModelsPaginator.ts                  | 3 ++-
 .../src/pagination/GetResourcesPaginator.ts               | 3 ++-
 .../src/pagination/GetRestApisPaginator.ts                | 3 ++-
 .../src/pagination/GetUsagePaginator.ts                   | 3 ++-
 .../src/pagination/GetUsagePlanKeysPaginator.ts           | 3 ++-
 .../src/pagination/GetUsagePlansPaginator.ts              | 3 ++-
 .../src/pagination/GetVpcLinksPaginator.ts                | 3 ++-
 .../src/pagination/ListGatewayRoutesPaginator.ts          | 3 ++-
 .../client-app-mesh/src/pagination/ListMeshesPaginator.ts | 3 ++-
 .../client-app-mesh/src/pagination/ListRoutesPaginator.ts | 3 ++-
 .../src/pagination/ListTagsForResourcePaginator.ts        | 3 ++-
 .../src/pagination/ListVirtualGatewaysPaginator.ts        | 3 ++-
 .../src/pagination/ListVirtualNodesPaginator.ts           | 3 ++-
 .../src/pagination/ListVirtualRoutersPaginator.ts         | 3 ++-
 .../src/pagination/ListVirtualServicesPaginator.ts        | 3 ++-
 .../src/pagination/ListApplicationsPaginator.ts           | 3 ++-
 .../src/pagination/ListConfigurationProfilesPaginator.ts  | 3 ++-
 .../src/pagination/ListDeploymentStrategiesPaginator.ts   | 3 ++-
 .../src/pagination/ListDeploymentsPaginator.ts            | 3 ++-
 .../src/pagination/ListEnvironmentsPaginator.ts           | 3 ++-
 .../ListHostedConfigurationVersionsPaginator.ts           | 3 ++-
 .../src/pagination/DescribeConnectorProfilesPaginator.ts  | 3 ++-
 .../src/pagination/DescribeConnectorsPaginator.ts         | 3 ++-
 .../pagination/DescribeFlowExecutionRecordsPaginator.ts   | 3 ++-
 .../src/pagination/ListConnectorsPaginator.ts             | 3 ++-
 .../client-appflow/src/pagination/ListFlowsPaginator.ts   | 3 ++-
 .../src/pagination/DescribeScalableTargetsPaginator.ts    | 3 ++-
 .../src/pagination/DescribeScalingActivitiesPaginator.ts  | 3 ++-
 .../src/pagination/DescribeScalingPoliciesPaginator.ts    | 3 ++-
 .../src/pagination/DescribeScheduledActionsPaginator.ts   | 3 ++-
 .../src/pagination/DescribeContinuousExportsPaginator.ts  | 3 ++-
 .../src/pagination/DescribeImportTasksPaginator.ts        | 3 ++-
 .../src/pagination/ListApplicationsPaginator.ts           | 3 ++-
 .../src/pagination/ListComponentsPaginator.ts             | 3 ++-
 .../src/pagination/ListConfigurationHistoryPaginator.ts   | 3 ++-
 .../src/pagination/ListLogPatternSetsPaginator.ts         | 3 ++-
 .../src/pagination/ListLogPatternsPaginator.ts            | 3 ++-
 .../src/pagination/ListProblemsPaginator.ts               | 3 ++-
 .../src/pagination/ListReportDefinitionsPaginator.ts      | 3 ++-
 .../src/pagination/DescribeCustomDomainsPaginator.ts      | 3 ++-
 .../pagination/ListAutoScalingConfigurationsPaginator.ts  | 3 ++-
 .../src/pagination/ListConnectionsPaginator.ts            | 3 ++-
 .../src/pagination/ListOperationsPaginator.ts             | 3 ++-
 .../src/pagination/ListServicesPaginator.ts               | 3 ++-
 .../src/pagination/ListVpcConnectorsPaginator.ts          | 3 ++-
 .../src/pagination/DescribeImagePermissionsPaginator.ts   | 3 ++-
 .../src/pagination/DescribeImagesPaginator.ts             | 3 ++-
 .../src/pagination/GetQueryResultsPaginator.ts            | 3 ++-
 .../src/pagination/ListDataCatalogsPaginator.ts           | 3 ++-
 .../src/pagination/ListDatabasesPaginator.ts              | 3 ++-
 .../src/pagination/ListNamedQueriesPaginator.ts           | 3 ++-
 .../src/pagination/ListPreparedStatementsPaginator.ts     | 3 ++-
 .../src/pagination/ListQueryExecutionsPaginator.ts        | 3 ++-
 .../src/pagination/ListTableMetadataPaginator.ts          | 3 ++-
 .../src/pagination/ListTagsForResourcePaginator.ts        | 3 ++-
 .../src/pagination/ListWorkGroupsPaginator.ts             | 3 ++-
 .../src/pagination/GetChangeLogsPaginator.ts              | 3 ++-
 .../src/pagination/GetDelegationsPaginator.ts             | 3 ++-
 .../pagination/GetEvidenceByEvidenceFolderPaginator.ts    | 3 ++-
 .../GetEvidenceFoldersByAssessmentControlPaginator.ts     | 3 ++-
 .../pagination/GetEvidenceFoldersByAssessmentPaginator.ts | 3 ++-
 ...stAssessmentControlInsightsByControlDomainPaginator.ts | 3 ++-
 .../ListAssessmentFrameworkShareRequestsPaginator.ts      | 3 ++-
 .../src/pagination/ListAssessmentFrameworksPaginator.ts   | 3 ++-
 .../src/pagination/ListAssessmentReportsPaginator.ts      | 3 ++-
 .../src/pagination/ListAssessmentsPaginator.ts            | 3 ++-
 .../ListControlDomainInsightsByAssessmentPaginator.ts     | 3 ++-
 .../src/pagination/ListControlDomainInsightsPaginator.ts  | 3 ++-
 .../ListControlInsightsByControlDomainPaginator.ts        | 3 ++-
 .../src/pagination/ListControlsPaginator.ts               | 3 ++-
 .../src/pagination/ListKeywordsForDataSourcePaginator.ts  | 3 ++-
 .../src/pagination/ListNotificationsPaginator.ts          | 3 ++-
 .../src/pagination/DescribeAutoScalingGroupsPaginator.ts  | 3 ++-
 .../pagination/DescribeAutoScalingInstancesPaginator.ts   | 3 ++-
 .../pagination/DescribeLaunchConfigurationsPaginator.ts   | 3 ++-
 .../DescribeNotificationConfigurationsPaginator.ts        | 3 ++-
 .../src/pagination/DescribePoliciesPaginator.ts           | 3 ++-
 .../src/pagination/DescribeScalingActivitiesPaginator.ts  | 3 ++-
 .../src/pagination/DescribeScheduledActionsPaginator.ts   | 3 ++-
 .../src/pagination/DescribeTagsPaginator.ts               | 3 ++-
 .../src/pagination/ListGatewaysPaginator.ts               | 3 ++-
 .../src/pagination/ListHypervisorsPaginator.ts            | 3 ++-
 .../src/pagination/ListVirtualMachinesPaginator.ts        | 3 ++-
 .../src/pagination/ListBackupJobsPaginator.ts             | 3 ++-
 .../src/pagination/ListBackupPlanTemplatesPaginator.ts    | 3 ++-
 .../src/pagination/ListBackupPlanVersionsPaginator.ts     | 3 ++-
 .../src/pagination/ListBackupPlansPaginator.ts            | 3 ++-
 .../src/pagination/ListBackupSelectionsPaginator.ts       | 3 ++-
 .../src/pagination/ListBackupVaultsPaginator.ts           | 3 ++-
 .../client-backup/src/pagination/ListCopyJobsPaginator.ts | 3 ++-
 .../src/pagination/ListFrameworksPaginator.ts             | 3 ++-
 .../src/pagination/ListProtectedResourcesPaginator.ts     | 3 ++-
 .../ListRecoveryPointsByBackupVaultPaginator.ts           | 3 ++-
 .../pagination/ListRecoveryPointsByResourcePaginator.ts   | 3 ++-
 .../src/pagination/ListReportJobsPaginator.ts             | 3 ++-
 .../src/pagination/ListReportPlansPaginator.ts            | 3 ++-
 .../src/pagination/ListRestoreJobsPaginator.ts            | 3 ++-
 clients/client-backup/src/pagination/ListTagsPaginator.ts | 3 ++-
 .../pagination/DescribeComputeEnvironmentsPaginator.ts    | 3 ++-
 .../src/pagination/DescribeJobDefinitionsPaginator.ts     | 3 ++-
 .../src/pagination/DescribeJobQueuesPaginator.ts          | 3 ++-
 clients/client-batch/src/pagination/ListJobsPaginator.ts  | 3 ++-
 .../src/pagination/ListSchedulingPoliciesPaginator.ts     | 3 ++-
 .../src/pagination/ListAccountAssociationsPaginator.ts    | 3 ++-
 .../pagination/ListBillingGroupCostReportsPaginator.ts    | 3 ++-
 .../src/pagination/ListBillingGroupsPaginator.ts          | 3 ++-
 .../src/pagination/ListCustomLineItemsPaginator.ts        | 3 ++-
 .../ListPricingPlansAssociatedWithPricingRulePaginator.ts | 3 ++-
 .../src/pagination/ListPricingPlansPaginator.ts           | 3 ++-
 .../ListPricingRulesAssociatedToPricingPlanPaginator.ts   | 3 ++-
 .../src/pagination/ListPricingRulesPaginator.ts           | 3 ++-
 .../ListResourcesAssociatedToCustomLineItemPaginator.ts   | 3 ++-
 .../src/pagination/SearchDevicesPaginator.ts              | 3 ++-
 .../client-braket/src/pagination/SearchJobsPaginator.ts   | 3 ++-
 .../src/pagination/SearchQuantumTasksPaginator.ts         | 3 ++-
 .../pagination/DescribeBudgetActionHistoriesPaginator.ts  | 3 ++-
 .../DescribeBudgetActionsForAccountPaginator.ts           | 3 ++-
 .../pagination/DescribeBudgetActionsForBudgetPaginator.ts | 3 ++-
 .../DescribeBudgetNotificationsForAccountPaginator.ts     | 3 ++-
 .../DescribeBudgetPerformanceHistoryPaginator.ts          | 3 ++-
 .../src/pagination/DescribeBudgetsPaginator.ts            | 3 ++-
 .../pagination/DescribeNotificationsForBudgetPaginator.ts | 3 ++-
 .../DescribeSubscribersForNotificationPaginator.ts        | 3 ++-
 .../src/pagination/ListAppInstanceAdminsPaginator.ts      | 3 ++-
 .../pagination/ListAppInstanceUserEndpointsPaginator.ts   | 3 ++-
 .../src/pagination/ListAppInstanceUsersPaginator.ts       | 3 ++-
 .../src/pagination/ListAppInstancesPaginator.ts           | 3 ++-
 .../src/pagination/ListAttendeesPaginator.ts              | 3 ++-
 .../src/pagination/ListChannelBansPaginator.ts            | 3 ++-
 .../src/pagination/ListChannelFlowsPaginator.ts           | 3 ++-
 .../ListChannelMembershipsForAppInstanceUserPaginator.ts  | 3 ++-
 .../src/pagination/ListChannelMembershipsPaginator.ts     | 3 ++-
 .../src/pagination/ListChannelMessagesPaginator.ts        | 3 ++-
 .../src/pagination/ListChannelModeratorsPaginator.ts      | 3 ++-
 .../ListChannelsAssociatedWithChannelFlowPaginator.ts     | 3 ++-
 .../ListChannelsModeratedByAppInstanceUserPaginator.ts    | 3 ++-
 .../src/pagination/ListChannelsPaginator.ts               | 3 ++-
 .../client-chime/src/pagination/ListAccountsPaginator.ts  | 3 ++-
 .../src/pagination/ListAppInstanceAdminsPaginator.ts      | 3 ++-
 .../src/pagination/ListAppInstanceUsersPaginator.ts       | 3 ++-
 .../src/pagination/ListAppInstancesPaginator.ts           | 3 ++-
 .../client-chime/src/pagination/ListAttendeesPaginator.ts | 3 ++-
 clients/client-chime/src/pagination/ListBotsPaginator.ts  | 3 ++-
 .../src/pagination/ListChannelBansPaginator.ts            | 3 ++-
 .../ListChannelMembershipsForAppInstanceUserPaginator.ts  | 3 ++-
 .../src/pagination/ListChannelMembershipsPaginator.ts     | 3 ++-
 .../src/pagination/ListChannelMessagesPaginator.ts        | 3 ++-
 .../src/pagination/ListChannelModeratorsPaginator.ts      | 3 ++-
 .../ListChannelsModeratedByAppInstanceUserPaginator.ts    | 3 ++-
 .../client-chime/src/pagination/ListChannelsPaginator.ts  | 3 ++-
 .../src/pagination/ListMediaCapturePipelinesPaginator.ts  | 3 ++-
 .../client-chime/src/pagination/ListMeetingsPaginator.ts  | 3 ++-
 .../src/pagination/ListPhoneNumberOrdersPaginator.ts      | 3 ++-
 .../src/pagination/ListPhoneNumbersPaginator.ts           | 3 ++-
 .../src/pagination/ListProxySessionsPaginator.ts          | 3 ++-
 .../src/pagination/ListRoomMembershipsPaginator.ts        | 3 ++-
 clients/client-chime/src/pagination/ListRoomsPaginator.ts | 3 ++-
 .../src/pagination/ListSipMediaApplicationsPaginator.ts   | 3 ++-
 .../client-chime/src/pagination/ListSipRulesPaginator.ts  | 3 ++-
 clients/client-chime/src/pagination/ListUsersPaginator.ts | 3 ++-
 .../src/pagination/ListVoiceConnectorGroupsPaginator.ts   | 3 ++-
 .../src/pagination/ListVoiceConnectorsPaginator.ts        | 3 ++-
 .../pagination/SearchAvailablePhoneNumbersPaginator.ts    | 3 ++-
 .../pagination/DescribeEnvironmentMembershipsPaginator.ts | 3 ++-
 .../src/pagination/ListEnvironmentsPaginator.ts           | 3 ++-
 .../src/pagination/ListResourceRequestsPaginator.ts       | 3 ++-
 .../src/pagination/ListResourcesPaginator.ts              | 3 ++-
 .../src/pagination/ListAppliedSchemaArnsPaginator.ts      | 3 ++-
 .../src/pagination/ListAttachedIndicesPaginator.ts        | 3 ++-
 .../src/pagination/ListDevelopmentSchemaArnsPaginator.ts  | 3 ++-
 .../src/pagination/ListDirectoriesPaginator.ts            | 3 ++-
 .../src/pagination/ListFacetAttributesPaginator.ts        | 3 ++-
 .../src/pagination/ListFacetNamesPaginator.ts             | 3 ++-
 .../src/pagination/ListIndexPaginator.ts                  | 3 ++-
 .../src/pagination/ListManagedSchemaArnsPaginator.ts      | 3 ++-
 .../src/pagination/ListObjectAttributesPaginator.ts       | 3 ++-
 .../src/pagination/ListObjectChildrenPaginator.ts         | 3 ++-
 .../src/pagination/ListObjectParentPathsPaginator.ts      | 3 ++-
 .../src/pagination/ListObjectParentsPaginator.ts          | 3 ++-
 .../src/pagination/ListObjectPoliciesPaginator.ts         | 3 ++-
 .../src/pagination/ListPolicyAttachmentsPaginator.ts      | 3 ++-
 .../src/pagination/ListPublishedSchemaArnsPaginator.ts    | 3 ++-
 .../src/pagination/ListTagsForResourcePaginator.ts        | 3 ++-
 .../pagination/ListTypedLinkFacetAttributesPaginator.ts   | 3 ++-
 .../src/pagination/ListTypedLinkFacetNamesPaginator.ts    | 3 ++-
 .../src/pagination/LookupPolicyPaginator.ts               | 3 ++-
 .../src/pagination/DescribeAccountLimitsPaginator.ts      | 3 ++-
 .../src/pagination/DescribeStackEventsPaginator.ts        | 3 ++-
 .../pagination/DescribeStackResourceDriftsPaginator.ts    | 3 ++-
 .../src/pagination/DescribeStacksPaginator.ts             | 3 ++-
 .../src/pagination/ListChangeSetsPaginator.ts             | 3 ++-
 .../src/pagination/ListExportsPaginator.ts                | 3 ++-
 .../src/pagination/ListImportsPaginator.ts                | 3 ++-
 .../src/pagination/ListStackInstancesPaginator.ts         | 3 ++-
 .../src/pagination/ListStackResourcesPaginator.ts         | 3 ++-
 .../pagination/ListStackSetOperationResultsPaginator.ts   | 3 ++-
 .../src/pagination/ListStackSetOperationsPaginator.ts     | 3 ++-
 .../src/pagination/ListStackSetsPaginator.ts              | 3 ++-
 .../src/pagination/ListStacksPaginator.ts                 | 3 ++-
 .../src/pagination/ListTypeRegistrationsPaginator.ts      | 3 ++-
 .../src/pagination/ListTypeVersionsPaginator.ts           | 3 ++-
 .../src/pagination/ListTypesPaginator.ts                  | 3 ++-
 .../ListCloudFrontOriginAccessIdentitiesPaginator.ts      | 3 ++-
 .../src/pagination/ListDistributionsPaginator.ts          | 3 ++-
 .../src/pagination/ListInvalidationsPaginator.ts          | 3 ++-
 .../src/pagination/ListStreamingDistributionsPaginator.ts | 3 ++-
 .../src/pagination/DescribeBackupsPaginator.ts            | 3 ++-
 .../src/pagination/DescribeClustersPaginator.ts           | 3 ++-
 .../src/pagination/ListTagsPaginator.ts                   | 3 ++-
 .../src/pagination/GetQueryResultsPaginator.ts            | 3 ++-
 .../src/pagination/ListEventDataStoresPaginator.ts        | 3 ++-
 .../src/pagination/ListPublicKeysPaginator.ts             | 3 ++-
 .../src/pagination/ListQueriesPaginator.ts                | 3 ++-
 .../client-cloudtrail/src/pagination/ListTagsPaginator.ts | 3 ++-
 .../src/pagination/ListTrailsPaginator.ts                 | 3 ++-
 .../src/pagination/LookupEventsPaginator.ts               | 3 ++-
 .../src/pagination/DescribeDestinationsPaginator.ts       | 3 ++-
 .../src/pagination/DescribeLogGroupsPaginator.ts          | 3 ++-
 .../src/pagination/DescribeLogStreamsPaginator.ts         | 3 ++-
 .../src/pagination/DescribeMetricFiltersPaginator.ts      | 3 ++-
 .../pagination/DescribeSubscriptionFiltersPaginator.ts    | 3 ++-
 .../src/pagination/FilterLogEventsPaginator.ts            | 3 ++-
 .../src/pagination/GetLogEventsPaginator.ts               | 3 ++-
 .../src/pagination/DescribeAlarmHistoryPaginator.ts       | 3 ++-
 .../src/pagination/DescribeAlarmsPaginator.ts             | 3 ++-
 .../src/pagination/DescribeInsightRulesPaginator.ts       | 3 ++-
 .../src/pagination/GetMetricDataPaginator.ts              | 3 ++-
 .../src/pagination/ListDashboardsPaginator.ts             | 3 ++-
 .../src/pagination/ListMetricStreamsPaginator.ts          | 3 ++-
 .../src/pagination/ListMetricsPaginator.ts                | 3 ++-
 .../src/pagination/ListDomainsPaginator.ts                | 3 ++-
 .../src/pagination/ListPackageVersionAssetsPaginator.ts   | 3 ++-
 .../src/pagination/ListPackageVersionsPaginator.ts        | 3 ++-
 .../src/pagination/ListPackagesPaginator.ts               | 3 ++-
 .../src/pagination/ListRepositoriesInDomainPaginator.ts   | 3 ++-
 .../src/pagination/ListRepositoriesPaginator.ts           | 3 ++-
 .../src/pagination/DescribeCodeCoveragesPaginator.ts      | 3 ++-
 .../src/pagination/DescribeTestCasesPaginator.ts          | 3 ++-
 .../src/pagination/ListBuildBatchesForProjectPaginator.ts | 3 ++-
 .../src/pagination/ListBuildBatchesPaginator.ts           | 3 ++-
 .../src/pagination/ListBuildsForProjectPaginator.ts       | 3 ++-
 .../src/pagination/ListBuildsPaginator.ts                 | 3 ++-
 .../src/pagination/ListProjectsPaginator.ts               | 3 ++-
 .../src/pagination/ListReportGroupsPaginator.ts           | 3 ++-
 .../src/pagination/ListReportsForReportGroupPaginator.ts  | 3 ++-
 .../src/pagination/ListReportsPaginator.ts                | 3 ++-
 .../src/pagination/ListSharedProjectsPaginator.ts         | 3 ++-
 .../src/pagination/ListSharedReportGroupsPaginator.ts     | 3 ++-
 .../src/pagination/DescribeMergeConflictsPaginator.ts     | 3 ++-
 .../src/pagination/DescribePullRequestEventsPaginator.ts  | 3 ++-
 .../src/pagination/GetCommentReactionsPaginator.ts        | 3 ++-
 .../pagination/GetCommentsForComparedCommitPaginator.ts   | 3 ++-
 .../src/pagination/GetCommentsForPullRequestPaginator.ts  | 3 ++-
 .../src/pagination/GetDifferencesPaginator.ts             | 3 ++-
 .../src/pagination/GetMergeConflictsPaginator.ts          | 3 ++-
 .../src/pagination/ListApprovalRuleTemplatesPaginator.ts  | 3 ++-
 ...sociatedApprovalRuleTemplatesForRepositoryPaginator.ts | 3 ++-
 .../src/pagination/ListBranchesPaginator.ts               | 3 ++-
 .../src/pagination/ListPullRequestsPaginator.ts           | 3 ++-
 .../ListRepositoriesForApprovalRuleTemplatePaginator.ts   | 3 ++-
 .../src/pagination/ListRepositoriesPaginator.ts           | 3 ++-
 .../src/pagination/ListApplicationRevisionsPaginator.ts   | 3 ++-
 .../src/pagination/ListApplicationsPaginator.ts           | 3 ++-
 .../src/pagination/ListDeploymentConfigsPaginator.ts      | 3 ++-
 .../src/pagination/ListDeploymentGroupsPaginator.ts       | 3 ++-
 .../src/pagination/ListDeploymentInstancesPaginator.ts    | 3 ++-
 .../src/pagination/ListDeploymentsPaginator.ts            | 3 ++-
 .../src/pagination/ListCodeReviewsPaginator.ts            | 3 ++-
 .../src/pagination/ListRecommendationFeedbackPaginator.ts | 3 ++-
 .../src/pagination/ListRecommendationsPaginator.ts        | 3 ++-
 .../src/pagination/ListRepositoryAssociationsPaginator.ts | 3 ++-
 .../GetFindingsReportAccountSummaryPaginator.ts           | 3 ++-
 .../src/pagination/ListFindingsReportsPaginator.ts        | 3 ++-
 .../src/pagination/ListProfileTimesPaginator.ts           | 3 ++-
 .../src/pagination/ListProfilingGroupsPaginator.ts        | 3 ++-
 .../src/pagination/ListActionExecutionsPaginator.ts       | 3 ++-
 .../src/pagination/ListActionTypesPaginator.ts            | 3 ++-
 .../src/pagination/ListPipelineExecutionsPaginator.ts     | 3 ++-
 .../src/pagination/ListPipelinesPaginator.ts              | 3 ++-
 .../src/pagination/ListTagsForResourcePaginator.ts        | 3 ++-
 .../src/pagination/ListWebhooksPaginator.ts               | 3 ++-
 .../src/pagination/ListConnectionsPaginator.ts            | 3 ++-
 .../src/pagination/ListHostsPaginator.ts                  | 3 ++-
 .../src/pagination/ListEventTypesPaginator.ts             | 3 ++-
 .../src/pagination/ListNotificationRulesPaginator.ts      | 3 ++-
 .../src/pagination/ListTargetsPaginator.ts                | 3 ++-
 .../src/pagination/AdminListGroupsForUserPaginator.ts     | 3 ++-
 .../src/pagination/AdminListUserAuthEventsPaginator.ts    | 3 ++-
 .../src/pagination/ListGroupsPaginator.ts                 | 3 ++-
 .../src/pagination/ListIdentityProvidersPaginator.ts      | 3 ++-
 .../src/pagination/ListResourceServersPaginator.ts        | 3 ++-
 .../src/pagination/ListUserPoolClientsPaginator.ts        | 3 ++-
 .../src/pagination/ListUserPoolsPaginator.ts              | 3 ++-
 .../src/pagination/ListUsersInGroupPaginator.ts           | 3 ++-
 .../src/pagination/ListUsersPaginator.ts                  | 3 ++-
 .../src/pagination/ListIdentityPoolsPaginator.ts          | 3 ++-
 .../pagination/ListDocumentClassificationJobsPaginator.ts | 3 ++-
 .../ListDocumentClassifierSummariesPaginator.ts           | 3 ++-
 .../src/pagination/ListDocumentClassifiersPaginator.ts    | 3 ++-
 .../ListDominantLanguageDetectionJobsPaginator.ts         | 3 ++-
 .../src/pagination/ListEntitiesDetectionJobsPaginator.ts  | 3 ++-
 .../pagination/ListEntityRecognizerSummariesPaginator.ts  | 3 ++-
 .../src/pagination/ListEntityRecognizersPaginator.ts      | 3 ++-
 .../src/pagination/ListEventsDetectionJobsPaginator.ts    | 3 ++-
 .../pagination/ListKeyPhrasesDetectionJobsPaginator.ts    | 3 ++-
 .../src/pagination/ListSentimentDetectionJobsPaginator.ts | 3 ++-
 .../ListTargetedSentimentDetectionJobsPaginator.ts        | 3 ++-
 .../src/pagination/ListTopicsDetectionJobsPaginator.ts    | 3 ++-
 .../DescribeAggregateComplianceByConfigRulesPaginator.ts  | 3 ++-
 ...cribeAggregateComplianceByConformancePacksPaginator.ts | 3 ++-
 .../DescribeAggregationAuthorizationsPaginator.ts         | 3 ++-
 .../pagination/DescribeComplianceByConfigRulePaginator.ts | 3 ++-
 .../pagination/DescribeComplianceByResourcePaginator.ts   | 3 ++-
 .../DescribeConfigRuleEvaluationStatusPaginator.ts        | 3 ++-
 .../src/pagination/DescribeConfigRulesPaginator.ts        | 3 ++-
 ...scribeConfigurationAggregatorSourcesStatusPaginator.ts | 3 ++-
 .../DescribeConfigurationAggregatorsPaginator.ts          | 3 ++-
 .../DescribeConformancePackCompliancePaginator.ts         | 3 ++-
 .../pagination/DescribeConformancePackStatusPaginator.ts  | 3 ++-
 .../src/pagination/DescribeConformancePacksPaginator.ts   | 3 ++-
 .../DescribeOrganizationConfigRuleStatusesPaginator.ts    | 3 ++-
 .../DescribeOrganizationConfigRulesPaginator.ts           | 3 ++-
 ...escribeOrganizationConformancePackStatusesPaginator.ts | 3 ++-
 .../DescribeOrganizationConformancePacksPaginator.ts      | 3 ++-
 .../DescribePendingAggregationRequestsPaginator.ts        | 3 ++-
 .../pagination/DescribeRemediationExceptionsPaginator.ts  | 3 ++-
 .../DescribeRemediationExecutionStatusPaginator.ts        | 3 ++-
 .../DescribeRetentionConfigurationsPaginator.ts           | 3 ++-
 .../GetAggregateComplianceDetailsByConfigRulePaginator.ts | 3 ++-
 .../GetAggregateConfigRuleComplianceSummaryPaginator.ts   | 3 ++-
 ...tAggregateConformancePackComplianceSummaryPaginator.ts | 3 ++-
 .../GetAggregateDiscoveredResourceCountsPaginator.ts      | 3 ++-
 .../GetComplianceDetailsByConfigRulePaginator.ts          | 3 ++-
 .../pagination/GetComplianceDetailsByResourcePaginator.ts | 3 ++-
 .../GetConformancePackComplianceDetailsPaginator.ts       | 3 ++-
 .../GetConformancePackComplianceSummaryPaginator.ts       | 3 ++-
 .../pagination/GetDiscoveredResourceCountsPaginator.ts    | 3 ++-
 .../GetOrganizationConfigRuleDetailedStatusPaginator.ts   | 3 ++-
 ...tOrganizationConformancePackDetailedStatusPaginator.ts | 3 ++-
 .../src/pagination/GetResourceConfigHistoryPaginator.ts   | 3 ++-
 .../ListAggregateDiscoveredResourcesPaginator.ts          | 3 ++-
 .../src/pagination/ListDiscoveredResourcesPaginator.ts    | 3 ++-
 .../src/pagination/ListStoredQueriesPaginator.ts          | 3 ++-
 .../src/pagination/ListTagsForResourcePaginator.ts        | 3 ++-
 .../pagination/SelectAggregateResourceConfigPaginator.ts  | 3 ++-
 .../src/pagination/SelectResourceConfigPaginator.ts       | 3 ++-
 .../ListRealtimeContactAnalysisSegmentsPaginator.ts       | 3 ++-
 .../src/pagination/GetCurrentMetricDataPaginator.ts       | 3 ++-
 .../src/pagination/GetMetricDataPaginator.ts              | 3 ++-
 .../src/pagination/ListAgentStatusesPaginator.ts          | 3 ++-
 .../src/pagination/ListApprovedOriginsPaginator.ts        | 3 ++-
 .../client-connect/src/pagination/ListBotsPaginator.ts    | 3 ++-
 .../src/pagination/ListContactFlowModulesPaginator.ts     | 3 ++-
 .../src/pagination/ListContactFlowsPaginator.ts           | 3 ++-
 .../src/pagination/ListContactReferencesPaginator.ts      | 3 ++-
 .../src/pagination/ListDefaultVocabulariesPaginator.ts    | 3 ++-
 .../src/pagination/ListHoursOfOperationsPaginator.ts      | 3 ++-
 .../src/pagination/ListInstanceAttributesPaginator.ts     | 3 ++-
 .../src/pagination/ListInstanceStorageConfigsPaginator.ts | 3 ++-
 .../src/pagination/ListInstancesPaginator.ts              | 3 ++-
 .../pagination/ListIntegrationAssociationsPaginator.ts    | 3 ++-
 .../src/pagination/ListLambdaFunctionsPaginator.ts        | 3 ++-
 .../client-connect/src/pagination/ListLexBotsPaginator.ts | 3 ++-
 .../src/pagination/ListPhoneNumbersPaginator.ts           | 3 ++-
 .../client-connect/src/pagination/ListPromptsPaginator.ts | 3 ++-
 .../src/pagination/ListQueueQuickConnectsPaginator.ts     | 3 ++-
 .../client-connect/src/pagination/ListQueuesPaginator.ts  | 3 ++-
 .../src/pagination/ListQuickConnectsPaginator.ts          | 3 ++-
 .../src/pagination/ListRoutingProfileQueuesPaginator.ts   | 3 ++-
 .../src/pagination/ListRoutingProfilesPaginator.ts        | 3 ++-
 .../src/pagination/ListSecurityKeysPaginator.ts           | 3 ++-
 .../pagination/ListSecurityProfilePermissionsPaginator.ts | 3 ++-
 .../src/pagination/ListSecurityProfilesPaginator.ts       | 3 ++-
 .../src/pagination/ListUseCasesPaginator.ts               | 3 ++-
 .../src/pagination/ListUserHierarchyGroupsPaginator.ts    | 3 ++-
 .../client-connect/src/pagination/ListUsersPaginator.ts   | 3 ++-
 .../src/pagination/SearchVocabulariesPaginator.ts         | 3 ++-
 .../src/pagination/GetTranscriptPaginator.ts              | 3 ++-
 .../src/pagination/DescribeReportDefinitionsPaginator.ts  | 3 ++-
 .../src/pagination/GetSavingsPlansCoveragePaginator.ts    | 3 ++-
 .../GetSavingsPlansUtilizationDetailsPaginator.ts         | 3 ++-
 .../pagination/ListCostCategoryDefinitionsPaginator.ts    | 3 ++-
 .../src/pagination/DescribeObjectsPaginator.ts            | 3 ++-
 .../src/pagination/ListPipelinesPaginator.ts              | 3 ++-
 .../src/pagination/QueryObjectsPaginator.ts               | 3 ++-
 .../DescribeApplicableIndividualAssessmentsPaginator.ts   | 3 ++-
 .../src/pagination/DescribeCertificatesPaginator.ts       | 3 ++-
 .../src/pagination/DescribeConnectionsPaginator.ts        | 3 ++-
 .../src/pagination/DescribeEndpointSettingsPaginator.ts   | 3 ++-
 .../src/pagination/DescribeEndpointTypesPaginator.ts      | 3 ++-
 .../src/pagination/DescribeEndpointsPaginator.ts          | 3 ++-
 .../src/pagination/DescribeEventSubscriptionsPaginator.ts | 3 ++-
 .../src/pagination/DescribeEventsPaginator.ts             | 3 ++-
 .../DescribeOrderableReplicationInstancesPaginator.ts     | 3 ++-
 .../DescribePendingMaintenanceActionsPaginator.ts         | 3 ++-
 .../DescribeReplicationInstanceTaskLogsPaginator.ts       | 3 ++-
 .../pagination/DescribeReplicationInstancesPaginator.ts   | 3 ++-
 .../DescribeReplicationSubnetGroupsPaginator.ts           | 3 ++-
 .../DescribeReplicationTaskAssessmentResultsPaginator.ts  | 3 ++-
 .../DescribeReplicationTaskAssessmentRunsPaginator.ts     | 3 ++-
 ...scribeReplicationTaskIndividualAssessmentsPaginator.ts | 3 ++-
 .../src/pagination/DescribeReplicationTasksPaginator.ts   | 3 ++-
 .../src/pagination/DescribeSchemasPaginator.ts            | 3 ++-
 .../src/pagination/DescribeTableStatisticsPaginator.ts    | 3 ++-
 .../src/pagination/ListDatasetsPaginator.ts               | 3 ++-
 .../src/pagination/ListJobRunsPaginator.ts                | 3 ++-
 .../client-databrew/src/pagination/ListJobsPaginator.ts   | 3 ++-
 .../src/pagination/ListProjectsPaginator.ts               | 3 ++-
 .../src/pagination/ListRecipeVersionsPaginator.ts         | 3 ++-
 .../src/pagination/ListRecipesPaginator.ts                | 3 ++-
 .../src/pagination/ListRulesetsPaginator.ts               | 3 ++-
 .../src/pagination/ListSchedulesPaginator.ts              | 3 ++-
 .../src/pagination/ListDataSetRevisionsPaginator.ts       | 3 ++-
 .../src/pagination/ListDataSetsPaginator.ts               | 3 ++-
 .../src/pagination/ListEventActionsPaginator.ts           | 3 ++-
 .../src/pagination/ListJobsPaginator.ts                   | 3 ++-
 .../src/pagination/ListRevisionAssetsPaginator.ts         | 3 ++-
 .../client-datasync/src/pagination/ListAgentsPaginator.ts | 3 ++-
 .../src/pagination/ListLocationsPaginator.ts              | 3 ++-
 .../src/pagination/ListTagsForResourcePaginator.ts        | 3 ++-
 .../src/pagination/ListTaskExecutionsPaginator.ts         | 3 ++-
 .../client-datasync/src/pagination/ListTasksPaginator.ts  | 3 ++-
 .../src/pagination/ListGraphsPaginator.ts                 | 3 ++-
 .../src/pagination/ListInvitationsPaginator.ts            | 3 ++-
 .../src/pagination/ListMembersPaginator.ts                | 3 ++-
 .../pagination/ListOrganizationAdminAccountsPaginator.ts  | 3 ++-
 .../src/pagination/GetOfferingStatusPaginator.ts          | 3 ++-
 .../src/pagination/ListArtifactsPaginator.ts              | 3 ++-
 .../src/pagination/ListDevicePoolsPaginator.ts            | 3 ++-
 .../src/pagination/ListDevicesPaginator.ts                | 3 ++-
 .../src/pagination/ListJobsPaginator.ts                   | 3 ++-
 .../src/pagination/ListOfferingTransactionsPaginator.ts   | 3 ++-
 .../src/pagination/ListOfferingsPaginator.ts              | 3 ++-
 .../src/pagination/ListProjectsPaginator.ts               | 3 ++-
 .../src/pagination/ListRunsPaginator.ts                   | 3 ++-
 .../src/pagination/ListSamplesPaginator.ts                | 3 ++-
 .../src/pagination/ListSuitesPaginator.ts                 | 3 ++-
 .../src/pagination/ListTestGridProjectsPaginator.ts       | 3 ++-
 .../src/pagination/ListTestGridSessionActionsPaginator.ts | 3 ++-
 .../pagination/ListTestGridSessionArtifactsPaginator.ts   | 3 ++-
 .../src/pagination/ListTestGridSessionsPaginator.ts       | 3 ++-
 .../src/pagination/ListTestsPaginator.ts                  | 3 ++-
 .../src/pagination/ListUniqueProblemsPaginator.ts         | 3 ++-
 .../src/pagination/ListUploadsPaginator.ts                | 3 ++-
 ...scribeOrganizationResourceCollectionHealthPaginator.ts | 3 ++-
 .../DescribeResourceCollectionHealthPaginator.ts          | 3 ++-
 .../src/pagination/GetCostEstimationPaginator.ts          | 3 ++-
 .../src/pagination/GetResourceCollectionPaginator.ts      | 3 ++-
 .../src/pagination/ListAnomaliesForInsightPaginator.ts    | 3 ++-
 .../src/pagination/ListEventsPaginator.ts                 | 3 ++-
 .../src/pagination/ListInsightsPaginator.ts               | 3 ++-
 .../src/pagination/ListNotificationChannelsPaginator.ts   | 3 ++-
 .../src/pagination/ListOrganizationInsightsPaginator.ts   | 3 ++-
 .../src/pagination/ListRecommendationsPaginator.ts        | 3 ++-
 .../src/pagination/SearchInsightsPaginator.ts             | 3 ++-
 .../src/pagination/SearchOrganizationInsightsPaginator.ts | 3 ++-
 .../src/pagination/DescribeDomainControllersPaginator.ts  | 3 ++-
 .../src/pagination/DescribeCertificatesPaginator.ts       | 3 ++-
 .../DescribeDBClusterParameterGroupsPaginator.ts          | 3 ++-
 .../pagination/DescribeDBClusterParametersPaginator.ts    | 3 ++-
 .../src/pagination/DescribeDBClusterSnapshotsPaginator.ts | 3 ++-
 .../src/pagination/DescribeDBClustersPaginator.ts         | 3 ++-
 .../src/pagination/DescribeDBEngineVersionsPaginator.ts   | 3 ++-
 .../src/pagination/DescribeDBInstancesPaginator.ts        | 3 ++-
 .../src/pagination/DescribeDBSubnetGroupsPaginator.ts     | 3 ++-
 .../src/pagination/DescribeEventSubscriptionsPaginator.ts | 3 ++-
 .../src/pagination/DescribeEventsPaginator.ts             | 3 ++-
 .../src/pagination/DescribeGlobalClustersPaginator.ts     | 3 ++-
 .../DescribeOrderableDBInstanceOptionsPaginator.ts        | 3 ++-
 .../DescribePendingMaintenanceActionsPaginator.ts         | 3 ++-
 .../src/pagination/DescribeJobLogItemsPaginator.ts        | 3 ++-
 .../client-drs/src/pagination/DescribeJobsPaginator.ts    | 3 ++-
 .../src/pagination/DescribeRecoveryInstancesPaginator.ts  | 3 ++-
 .../src/pagination/DescribeRecoverySnapshotsPaginator.ts  | 3 ++-
 .../DescribeReplicationConfigurationTemplatesPaginator.ts | 3 ++-
 .../src/pagination/DescribeSourceServersPaginator.ts      | 3 ++-
 .../src/pagination/ListContributorInsightsPaginator.ts    | 3 ++-
 .../src/pagination/ListExportsPaginator.ts                | 3 ++-
 .../client-dynamodb/src/pagination/ListTablesPaginator.ts | 3 ++-
 clients/client-dynamodb/src/pagination/QueryPaginator.ts  | 3 ++-
 clients/client-dynamodb/src/pagination/ScanPaginator.ts   | 3 ++-
 .../src/pagination/ListChangedBlocksPaginator.ts          | 3 ++-
 .../src/pagination/ListSnapshotBlocksPaginator.ts         | 3 ++-
 .../src/pagination/DescribeAddressesAttributePaginator.ts | 3 ++-
 .../src/pagination/DescribeByoipCidrsPaginator.ts         | 3 ++-
 .../DescribeCapacityReservationFleetsPaginator.ts         | 3 ++-
 .../pagination/DescribeCapacityReservationsPaginator.ts   | 3 ++-
 .../src/pagination/DescribeCarrierGatewaysPaginator.ts    | 3 ++-
 .../pagination/DescribeClassicLinkInstancesPaginator.ts   | 3 ++-
 .../DescribeClientVpnAuthorizationRulesPaginator.ts       | 3 ++-
 .../pagination/DescribeClientVpnConnectionsPaginator.ts   | 3 ++-
 .../src/pagination/DescribeClientVpnEndpointsPaginator.ts | 3 ++-
 .../src/pagination/DescribeClientVpnRoutesPaginator.ts    | 3 ++-
 .../DescribeClientVpnTargetNetworksPaginator.ts           | 3 ++-
 .../src/pagination/DescribeCoipPoolsPaginator.ts          | 3 ++-
 .../src/pagination/DescribeDhcpOptionsPaginator.ts        | 3 ++-
 .../DescribeEgressOnlyInternetGatewaysPaginator.ts        | 3 ++-
 .../src/pagination/DescribeExportImageTasksPaginator.ts   | 3 ++-
 .../src/pagination/DescribeFastLaunchImagesPaginator.ts   | 3 ++-
 .../pagination/DescribeFastSnapshotRestoresPaginator.ts   | 3 ++-
 .../client-ec2/src/pagination/DescribeFleetsPaginator.ts  | 3 ++-
 .../src/pagination/DescribeFlowLogsPaginator.ts           | 3 ++-
 .../src/pagination/DescribeFpgaImagesPaginator.ts         | 3 ++-
 .../DescribeHostReservationOfferingsPaginator.ts          | 3 ++-
 .../src/pagination/DescribeHostReservationsPaginator.ts   | 3 ++-
 .../client-ec2/src/pagination/DescribeHostsPaginator.ts   | 3 ++-
 .../DescribeIamInstanceProfileAssociationsPaginator.ts    | 3 ++-
 .../src/pagination/DescribeImportImageTasksPaginator.ts   | 3 ++-
 .../pagination/DescribeImportSnapshotTasksPaginator.ts    | 3 ++-
 .../DescribeInstanceCreditSpecificationsPaginator.ts      | 3 ++-
 .../pagination/DescribeInstanceEventWindowsPaginator.ts   | 3 ++-
 .../src/pagination/DescribeInstanceStatusPaginator.ts     | 3 ++-
 .../pagination/DescribeInstanceTypeOfferingsPaginator.ts  | 3 ++-
 .../src/pagination/DescribeInstanceTypesPaginator.ts      | 3 ++-
 .../src/pagination/DescribeInstancesPaginator.ts          | 3 ++-
 .../src/pagination/DescribeInternetGatewaysPaginator.ts   | 3 ++-
 .../src/pagination/DescribeIpamPoolsPaginator.ts          | 3 ++-
 .../src/pagination/DescribeIpamScopesPaginator.ts         | 3 ++-
 .../client-ec2/src/pagination/DescribeIpamsPaginator.ts   | 3 ++-
 .../src/pagination/DescribeIpv6PoolsPaginator.ts          | 3 ++-
 .../pagination/DescribeLaunchTemplateVersionsPaginator.ts | 3 ++-
 .../src/pagination/DescribeLaunchTemplatesPaginator.ts    | 3 ++-
 ...outeTableVirtualInterfaceGroupAssociationsPaginator.ts | 3 ++-
 ...cribeLocalGatewayRouteTableVpcAssociationsPaginator.ts | 3 ++-
 .../DescribeLocalGatewayRouteTablesPaginator.ts           | 3 ++-
 ...DescribeLocalGatewayVirtualInterfaceGroupsPaginator.ts | 3 ++-
 .../DescribeLocalGatewayVirtualInterfacesPaginator.ts     | 3 ++-
 .../src/pagination/DescribeLocalGatewaysPaginator.ts      | 3 ++-
 .../src/pagination/DescribeManagedPrefixListsPaginator.ts | 3 ++-
 .../src/pagination/DescribeMovingAddressesPaginator.ts    | 3 ++-
 .../src/pagination/DescribeNatGatewaysPaginator.ts        | 3 ++-
 .../src/pagination/DescribeNetworkAclsPaginator.ts        | 3 ++-
 ...DescribeNetworkInsightsAccessScopeAnalysesPaginator.ts | 3 ++-
 .../DescribeNetworkInsightsAccessScopesPaginator.ts       | 3 ++-
 .../DescribeNetworkInsightsAnalysesPaginator.ts           | 3 ++-
 .../pagination/DescribeNetworkInsightsPathsPaginator.ts   | 3 ++-
 .../DescribeNetworkInterfacePermissionsPaginator.ts       | 3 ++-
 .../src/pagination/DescribeNetworkInterfacesPaginator.ts  | 3 ++-
 .../src/pagination/DescribePrefixListsPaginator.ts        | 3 ++-
 .../src/pagination/DescribePrincipalIdFormatPaginator.ts  | 3 ++-
 .../src/pagination/DescribePublicIpv4PoolsPaginator.ts    | 3 ++-
 .../pagination/DescribeReplaceRootVolumeTasksPaginator.ts | 3 ++-
 .../DescribeReservedInstancesModificationsPaginator.ts    | 3 ++-
 .../DescribeReservedInstancesOfferingsPaginator.ts        | 3 ++-
 .../src/pagination/DescribeRouteTablesPaginator.ts        | 3 ++-
 .../DescribeScheduledInstanceAvailabilityPaginator.ts     | 3 ++-
 .../src/pagination/DescribeScheduledInstancesPaginator.ts | 3 ++-
 .../src/pagination/DescribeSecurityGroupRulesPaginator.ts | 3 ++-
 .../src/pagination/DescribeSecurityGroupsPaginator.ts     | 3 ++-
 .../src/pagination/DescribeSnapshotTierStatusPaginator.ts | 3 ++-
 .../src/pagination/DescribeSnapshotsPaginator.ts          | 3 ++-
 .../src/pagination/DescribeSpotFleetRequestsPaginator.ts  | 3 ++-
 .../pagination/DescribeSpotInstanceRequestsPaginator.ts   | 3 ++-
 .../src/pagination/DescribeSpotPriceHistoryPaginator.ts   | 3 ++-
 .../pagination/DescribeStaleSecurityGroupsPaginator.ts    | 3 ++-
 .../src/pagination/DescribeStoreImageTasksPaginator.ts    | 3 ++-
 .../client-ec2/src/pagination/DescribeSubnetsPaginator.ts | 3 ++-
 .../client-ec2/src/pagination/DescribeTagsPaginator.ts    | 3 ++-
 .../pagination/DescribeTrafficMirrorFiltersPaginator.ts   | 3 ++-
 .../pagination/DescribeTrafficMirrorSessionsPaginator.ts  | 3 ++-
 .../pagination/DescribeTrafficMirrorTargetsPaginator.ts   | 3 ++-
 .../DescribeTransitGatewayAttachmentsPaginator.ts         | 3 ++-
 .../DescribeTransitGatewayConnectPeersPaginator.ts        | 3 ++-
 .../pagination/DescribeTransitGatewayConnectsPaginator.ts | 3 ++-
 .../DescribeTransitGatewayMulticastDomainsPaginator.ts    | 3 ++-
 .../DescribeTransitGatewayPeeringAttachmentsPaginator.ts  | 3 ++-
 .../DescribeTransitGatewayRouteTablesPaginator.ts         | 3 ++-
 .../DescribeTransitGatewayVpcAttachmentsPaginator.ts      | 3 ++-
 .../src/pagination/DescribeTransitGatewaysPaginator.ts    | 3 ++-
 .../DescribeTrunkInterfaceAssociationsPaginator.ts        | 3 ++-
 .../src/pagination/DescribeVolumeStatusPaginator.ts       | 3 ++-
 .../pagination/DescribeVolumesModificationsPaginator.ts   | 3 ++-
 .../client-ec2/src/pagination/DescribeVolumesPaginator.ts | 3 ++-
 .../DescribeVpcClassicLinkDnsSupportPaginator.ts          | 3 ++-
 ...DescribeVpcEndpointConnectionNotificationsPaginator.ts | 3 ++-
 .../pagination/DescribeVpcEndpointConnectionsPaginator.ts | 3 ++-
 .../DescribeVpcEndpointServiceConfigurationsPaginator.ts  | 3 ++-
 .../DescribeVpcEndpointServicePermissionsPaginator.ts     | 3 ++-
 .../src/pagination/DescribeVpcEndpointsPaginator.ts       | 3 ++-
 .../pagination/DescribeVpcPeeringConnectionsPaginator.ts  | 3 ++-
 .../client-ec2/src/pagination/DescribeVpcsPaginator.ts    | 3 ++-
 .../src/pagination/GetAssociatedIpv6PoolCidrsPaginator.ts | 3 ++-
 .../GetGroupsForCapacityReservationPaginator.ts           | 3 ++-
 .../GetInstanceTypesFromInstanceRequirementsPaginator.ts  | 3 ++-
 .../src/pagination/GetIpamAddressHistoryPaginator.ts      | 3 ++-
 .../src/pagination/GetIpamPoolAllocationsPaginator.ts     | 3 ++-
 .../src/pagination/GetIpamPoolCidrsPaginator.ts           | 3 ++-
 .../src/pagination/GetIpamResourceCidrsPaginator.ts       | 3 ++-
 .../GetManagedPrefixListAssociationsPaginator.ts          | 3 ++-
 .../pagination/GetManagedPrefixListEntriesPaginator.ts    | 3 ++-
 .../src/pagination/GetSpotPlacementScoresPaginator.ts     | 3 ++-
 .../GetTransitGatewayAttachmentPropagationsPaginator.ts   | 3 ++-
 ...tTransitGatewayMulticastDomainAssociationsPaginator.ts | 3 ++-
 .../GetTransitGatewayPrefixListReferencesPaginator.ts     | 3 ++-
 .../GetTransitGatewayRouteTableAssociationsPaginator.ts   | 3 ++-
 .../GetTransitGatewayRouteTablePropagationsPaginator.ts   | 3 ++-
 .../pagination/GetVpnConnectionDeviceTypesPaginator.ts    | 3 ++-
 .../src/pagination/ListImagesInRecycleBinPaginator.ts     | 3 ++-
 .../src/pagination/ListSnapshotsInRecycleBinPaginator.ts  | 3 ++-
 .../src/pagination/SearchLocalGatewayRoutesPaginator.ts   | 3 ++-
 .../SearchTransitGatewayMulticastGroupsPaginator.ts       | 3 ++-
 .../src/pagination/DescribeImageTagsPaginator.ts          | 3 ++-
 .../src/pagination/DescribeImagesPaginator.ts             | 3 ++-
 .../src/pagination/DescribeRegistriesPaginator.ts         | 3 ++-
 .../src/pagination/DescribeRepositoriesPaginator.ts       | 3 ++-
 .../src/pagination/DescribeImageScanFindingsPaginator.ts  | 3 ++-
 .../client-ecr/src/pagination/DescribeImagesPaginator.ts  | 3 ++-
 .../pagination/DescribePullThroughCacheRulesPaginator.ts  | 3 ++-
 .../src/pagination/DescribeRepositoriesPaginator.ts       | 3 ++-
 .../src/pagination/GetLifecyclePolicyPreviewPaginator.ts  | 3 ++-
 clients/client-ecr/src/pagination/ListImagesPaginator.ts  | 3 ++-
 .../src/pagination/ListAccountSettingsPaginator.ts        | 3 ++-
 .../client-ecs/src/pagination/ListAttributesPaginator.ts  | 3 ++-
 .../client-ecs/src/pagination/ListClustersPaginator.ts    | 3 ++-
 .../src/pagination/ListContainerInstancesPaginator.ts     | 3 ++-
 .../client-ecs/src/pagination/ListServicesPaginator.ts    | 3 ++-
 .../src/pagination/ListTaskDefinitionFamiliesPaginator.ts | 3 ++-
 .../src/pagination/ListTaskDefinitionsPaginator.ts        | 3 ++-
 clients/client-ecs/src/pagination/ListTasksPaginator.ts   | 3 ++-
 .../src/pagination/DescribeAccessPointsPaginator.ts       | 3 ++-
 .../src/pagination/DescribeFileSystemsPaginator.ts        | 3 ++-
 .../client-efs/src/pagination/DescribeTagsPaginator.ts    | 3 ++-
 .../src/pagination/ListTagsForResourcePaginator.ts        | 3 ++-
 .../src/pagination/DescribeAddonVersionsPaginator.ts      | 3 ++-
 clients/client-eks/src/pagination/ListAddonsPaginator.ts  | 3 ++-
 .../client-eks/src/pagination/ListClustersPaginator.ts    | 3 ++-
 .../src/pagination/ListFargateProfilesPaginator.ts        | 3 ++-
 .../pagination/ListIdentityProviderConfigsPaginator.ts    | 3 ++-
 .../client-eks/src/pagination/ListNodegroupsPaginator.ts  | 3 ++-
 clients/client-eks/src/pagination/ListUpdatesPaginator.ts | 3 ++-
 .../DescribeEnvironmentManagedActionHistoryPaginator.ts   | 3 ++-
 .../src/pagination/DescribeEventsPaginator.ts             | 3 ++-
 .../src/pagination/ListPlatformBranchesPaginator.ts       | 3 ++-
 .../src/pagination/ListPlatformVersionsPaginator.ts       | 3 ++-
 .../src/pagination/DescribeAcceleratorsPaginator.ts       | 3 ++-
 .../src/pagination/DescribeListenersPaginator.ts          | 3 ++-
 .../src/pagination/DescribeLoadBalancersPaginator.ts      | 3 ++-
 .../src/pagination/DescribeTargetGroupsPaginator.ts       | 3 ++-
 .../src/pagination/DescribeLoadBalancersPaginator.ts      | 3 ++-
 .../src/pagination/ListJobsByPipelinePaginator.ts         | 3 ++-
 .../src/pagination/ListJobsByStatusPaginator.ts           | 3 ++-
 .../src/pagination/ListPipelinesPaginator.ts              | 3 ++-
 .../src/pagination/ListPresetsPaginator.ts                | 3 ++-
 .../src/pagination/DescribeCacheClustersPaginator.ts      | 3 ++-
 .../pagination/DescribeCacheEngineVersionsPaginator.ts    | 3 ++-
 .../pagination/DescribeCacheParameterGroupsPaginator.ts   | 3 ++-
 .../src/pagination/DescribeCacheParametersPaginator.ts    | 3 ++-
 .../pagination/DescribeCacheSecurityGroupsPaginator.ts    | 3 ++-
 .../src/pagination/DescribeCacheSubnetGroupsPaginator.ts  | 3 ++-
 .../DescribeEngineDefaultParametersPaginator.ts           | 3 ++-
 .../src/pagination/DescribeEventsPaginator.ts             | 3 ++-
 .../DescribeGlobalReplicationGroupsPaginator.ts           | 3 ++-
 .../src/pagination/DescribeReplicationGroupsPaginator.ts  | 3 ++-
 .../DescribeReservedCacheNodesOfferingsPaginator.ts       | 3 ++-
 .../src/pagination/DescribeReservedCacheNodesPaginator.ts | 3 ++-
 .../src/pagination/DescribeServiceUpdatesPaginator.ts     | 3 ++-
 .../src/pagination/DescribeSnapshotsPaginator.ts          | 3 ++-
 .../src/pagination/DescribeUpdateActionsPaginator.ts      | 3 ++-
 .../src/pagination/DescribeUserGroupsPaginator.ts         | 3 ++-
 .../src/pagination/DescribeUsersPaginator.ts              | 3 ++-
 .../src/pagination/DescribeDomainAutoTunesPaginator.ts    | 3 ++-
 ...scribeInboundCrossClusterSearchConnectionsPaginator.ts | 3 ++-
 ...cribeOutboundCrossClusterSearchConnectionsPaginator.ts | 3 ++-
 .../src/pagination/DescribePackagesPaginator.ts           | 3 ++-
 ...ribeReservedElasticsearchInstanceOfferingsPaginator.ts | 3 ++-
 .../DescribeReservedElasticsearchInstancesPaginator.ts    | 3 ++-
 .../src/pagination/GetPackageVersionHistoryPaginator.ts   | 3 ++-
 .../src/pagination/GetUpgradeHistoryPaginator.ts          | 3 ++-
 .../src/pagination/ListDomainsForPackagePaginator.ts      | 3 ++-
 .../pagination/ListElasticsearchInstanceTypesPaginator.ts | 3 ++-
 .../src/pagination/ListElasticsearchVersionsPaginator.ts  | 3 ++-
 .../src/pagination/ListPackagesForDomainPaginator.ts      | 3 ++-
 .../src/pagination/ListJobRunsPaginator.ts                | 3 ++-
 .../src/pagination/ListManagedEndpointsPaginator.ts       | 3 ++-
 .../src/pagination/ListVirtualClustersPaginator.ts        | 3 ++-
 .../src/pagination/ListBootstrapActionsPaginator.ts       | 3 ++-
 .../client-emr/src/pagination/ListClustersPaginator.ts    | 3 ++-
 .../src/pagination/ListInstanceFleetsPaginator.ts         | 3 ++-
 .../src/pagination/ListInstanceGroupsPaginator.ts         | 3 ++-
 .../client-emr/src/pagination/ListInstancesPaginator.ts   | 3 ++-
 .../src/pagination/ListNotebookExecutionsPaginator.ts     | 3 ++-
 .../src/pagination/ListReleaseLabelsPaginator.ts          | 3 ++-
 .../src/pagination/ListSecurityConfigurationsPaginator.ts | 3 ++-
 clients/client-emr/src/pagination/ListStepsPaginator.ts   | 3 ++-
 .../src/pagination/ListStudioSessionMappingsPaginator.ts  | 3 ++-
 clients/client-emr/src/pagination/ListStudiosPaginator.ts | 3 ++-
 .../src/pagination/ListExperimentsPaginator.ts            | 3 ++-
 .../src/pagination/ListFeaturesPaginator.ts               | 3 ++-
 .../src/pagination/ListLaunchesPaginator.ts               | 3 ++-
 .../src/pagination/ListProjectsPaginator.ts               | 3 ++-
 .../src/pagination/ListChangesetsPaginator.ts             | 3 ++-
 .../src/pagination/ListDataViewsPaginator.ts              | 3 ++-
 .../src/pagination/ListDatasetsPaginator.ts               | 3 ++-
 .../src/pagination/ListPermissionGroupsPaginator.ts       | 3 ++-
 .../src/pagination/ListUsersPaginator.ts                  | 3 ++-
 clients/client-fis/src/pagination/ListActionsPaginator.ts | 3 ++-
 .../src/pagination/ListExperimentTemplatesPaginator.ts    | 3 ++-
 .../client-fis/src/pagination/ListExperimentsPaginator.ts | 3 ++-
 .../src/pagination/ListTargetResourceTypesPaginator.ts    | 3 ++-
 .../client-fms/src/pagination/ListAppsListsPaginator.ts   | 3 ++-
 .../src/pagination/ListComplianceStatusPaginator.ts       | 3 ++-
 .../src/pagination/ListMemberAccountsPaginator.ts         | 3 ++-
 .../client-fms/src/pagination/ListPoliciesPaginator.ts    | 3 ++-
 .../src/pagination/ListProtocolsListsPaginator.ts         | 3 ++-
 .../ListThirdPartyFirewallFirewallPoliciesPaginator.ts    | 3 ++-
 .../src/pagination/ListDatasetGroupsPaginator.ts          | 3 ++-
 .../src/pagination/ListDatasetImportJobsPaginator.ts      | 3 ++-
 .../src/pagination/ListDatasetsPaginator.ts               | 3 ++-
 .../src/pagination/ListForecastExportJobsPaginator.ts     | 3 ++-
 .../src/pagination/ListForecastsPaginator.ts              | 3 ++-
 .../ListPredictorBacktestExportJobsPaginator.ts           | 3 ++-
 .../src/pagination/ListPredictorsPaginator.ts             | 3 ++-
 .../src/pagination/DescribeModelVersionsPaginator.ts      | 3 ++-
 .../src/pagination/GetBatchImportJobsPaginator.ts         | 3 ++-
 .../src/pagination/GetBatchPredictionJobsPaginator.ts     | 3 ++-
 .../src/pagination/GetDetectorsPaginator.ts               | 3 ++-
 .../src/pagination/GetEntityTypesPaginator.ts             | 3 ++-
 .../src/pagination/GetEventTypesPaginator.ts              | 3 ++-
 .../src/pagination/GetExternalModelsPaginator.ts          | 3 ++-
 .../src/pagination/GetLabelsPaginator.ts                  | 3 ++-
 .../src/pagination/GetModelsPaginator.ts                  | 3 ++-
 .../src/pagination/GetOutcomesPaginator.ts                | 3 ++-
 .../src/pagination/GetRulesPaginator.ts                   | 3 ++-
 .../src/pagination/GetVariablesPaginator.ts               | 3 ++-
 .../src/pagination/ListEventPredictionsPaginator.ts       | 3 ++-
 .../src/pagination/ListTagsForResourcePaginator.ts        | 3 ++-
 .../client-fsx/src/pagination/DescribeBackupsPaginator.ts | 3 ++-
 .../DescribeDataRepositoryAssociationsPaginator.ts        | 3 ++-
 .../pagination/DescribeDataRepositoryTasksPaginator.ts    | 3 ++-
 .../src/pagination/DescribeFileSystemAliasesPaginator.ts  | 3 ++-
 .../src/pagination/DescribeFileSystemsPaginator.ts        | 3 ++-
 .../src/pagination/DescribeSnapshotsPaginator.ts          | 3 ++-
 .../pagination/DescribeStorageVirtualMachinesPaginator.ts | 3 ++-
 .../client-fsx/src/pagination/DescribeVolumesPaginator.ts | 3 ++-
 .../src/pagination/ListTagsForResourcePaginator.ts        | 3 ++-
 .../src/pagination/DescribeFleetAttributesPaginator.ts    | 3 ++-
 .../src/pagination/DescribeFleetCapacityPaginator.ts      | 3 ++-
 .../src/pagination/DescribeFleetEventsPaginator.ts        | 3 ++-
 .../DescribeFleetLocationAttributesPaginator.ts           | 3 ++-
 .../src/pagination/DescribeFleetUtilizationPaginator.ts   | 3 ++-
 .../pagination/DescribeGameServerInstancesPaginator.ts    | 3 ++-
 .../src/pagination/DescribeGameSessionDetailsPaginator.ts | 3 ++-
 .../src/pagination/DescribeGameSessionQueuesPaginator.ts  | 3 ++-
 .../src/pagination/DescribeGameSessionsPaginator.ts       | 3 ++-
 .../src/pagination/DescribeInstancesPaginator.ts          | 3 ++-
 .../DescribeMatchmakingConfigurationsPaginator.ts         | 3 ++-
 .../pagination/DescribeMatchmakingRuleSetsPaginator.ts    | 3 ++-
 .../src/pagination/DescribePlayerSessionsPaginator.ts     | 3 ++-
 .../src/pagination/DescribeScalingPoliciesPaginator.ts    | 3 ++-
 .../src/pagination/ListAliasesPaginator.ts                | 3 ++-
 .../client-gamelift/src/pagination/ListBuildsPaginator.ts | 3 ++-
 .../client-gamelift/src/pagination/ListFleetsPaginator.ts | 3 ++-
 .../src/pagination/ListGameServerGroupsPaginator.ts       | 3 ++-
 .../src/pagination/ListGameServersPaginator.ts            | 3 ++-
 .../src/pagination/ListScriptsPaginator.ts                | 3 ++-
 .../src/pagination/SearchGameSessionsPaginator.ts         | 3 ++-
 .../src/pagination/ListExtensionVersionsPaginator.ts      | 3 ++-
 .../src/pagination/ListExtensionsPaginator.ts             | 3 ++-
 .../src/pagination/ListGamesPaginator.ts                  | 3 ++-
 .../src/pagination/ListGeneratedCodeJobsPaginator.ts      | 3 ++-
 .../src/pagination/ListSnapshotsPaginator.ts              | 3 ++-
 .../src/pagination/ListStageDeploymentsPaginator.ts       | 3 ++-
 .../src/pagination/ListStagesPaginator.ts                 | 3 ++-
 .../client-glacier/src/pagination/ListJobsPaginator.ts    | 3 ++-
 .../src/pagination/ListMultipartUploadsPaginator.ts       | 3 ++-
 .../client-glacier/src/pagination/ListPartsPaginator.ts   | 3 ++-
 .../client-glacier/src/pagination/ListVaultsPaginator.ts  | 3 ++-
 .../src/pagination/ListAcceleratorsPaginator.ts           | 3 ++-
 .../src/pagination/ListByoipCidrsPaginator.ts             | 3 ++-
 .../pagination/ListCustomRoutingAcceleratorsPaginator.ts  | 3 ++-
 .../ListCustomRoutingEndpointGroupsPaginator.ts           | 3 ++-
 .../src/pagination/ListCustomRoutingListenersPaginator.ts | 3 ++-
 ...ListCustomRoutingPortMappingsByDestinationPaginator.ts | 3 ++-
 .../pagination/ListCustomRoutingPortMappingsPaginator.ts  | 3 ++-
 .../src/pagination/ListEndpointGroupsPaginator.ts         | 3 ++-
 .../src/pagination/ListListenersPaginator.ts              | 3 ++-
 .../src/pagination/GetBlueprintRunsPaginator.ts           | 3 ++-
 .../client-glue/src/pagination/GetClassifiersPaginator.ts | 3 ++-
 .../client-glue/src/pagination/GetConnectionsPaginator.ts | 3 ++-
 .../src/pagination/GetCrawlerMetricsPaginator.ts          | 3 ++-
 .../client-glue/src/pagination/GetCrawlersPaginator.ts    | 3 ++-
 .../client-glue/src/pagination/GetDatabasesPaginator.ts   | 3 ++-
 .../src/pagination/GetDevEndpointsPaginator.ts            | 3 ++-
 clients/client-glue/src/pagination/GetJobRunsPaginator.ts | 3 ++-
 clients/client-glue/src/pagination/GetJobsPaginator.ts    | 3 ++-
 .../client-glue/src/pagination/GetMLTaskRunsPaginator.ts  | 3 ++-
 .../src/pagination/GetMLTransformsPaginator.ts            | 3 ++-
 .../src/pagination/GetPartitionIndexesPaginator.ts        | 3 ++-
 .../client-glue/src/pagination/GetPartitionsPaginator.ts  | 3 ++-
 .../src/pagination/GetResourcePoliciesPaginator.ts        | 3 ++-
 .../src/pagination/GetSecurityConfigurationsPaginator.ts  | 3 ++-
 .../src/pagination/GetTableVersionsPaginator.ts           | 3 ++-
 clients/client-glue/src/pagination/GetTablesPaginator.ts  | 3 ++-
 .../client-glue/src/pagination/GetTriggersPaginator.ts    | 3 ++-
 .../GetUnfilteredPartitionsMetadataPaginator.ts           | 3 ++-
 .../src/pagination/GetUserDefinedFunctionsPaginator.ts    | 3 ++-
 .../src/pagination/GetWorkflowRunsPaginator.ts            | 3 ++-
 .../client-glue/src/pagination/ListBlueprintsPaginator.ts | 3 ++-
 .../client-glue/src/pagination/ListCrawlersPaginator.ts   | 3 ++-
 .../src/pagination/ListDevEndpointsPaginator.ts           | 3 ++-
 clients/client-glue/src/pagination/ListJobsPaginator.ts   | 3 ++-
 .../src/pagination/ListMLTransformsPaginator.ts           | 3 ++-
 .../client-glue/src/pagination/ListRegistriesPaginator.ts | 3 ++-
 .../src/pagination/ListSchemaVersionsPaginator.ts         | 3 ++-
 .../client-glue/src/pagination/ListSchemasPaginator.ts    | 3 ++-
 .../client-glue/src/pagination/ListSessionsPaginator.ts   | 3 ++-
 .../client-glue/src/pagination/ListTriggersPaginator.ts   | 3 ++-
 .../client-glue/src/pagination/ListWorkflowsPaginator.ts  | 3 ++-
 .../client-glue/src/pagination/SearchTablesPaginator.ts   | 3 ++-
 .../src/pagination/ListPermissionsPaginator.ts            | 3 ++-
 .../src/pagination/ListWorkspacesPaginator.ts             | 3 ++-
 .../ListClientDevicesAssociatedWithCoreDevicePaginator.ts | 3 ++-
 .../src/pagination/ListComponentVersionsPaginator.ts      | 3 ++-
 .../src/pagination/ListComponentsPaginator.ts             | 3 ++-
 .../src/pagination/ListCoreDevicesPaginator.ts            | 3 ++-
 .../src/pagination/ListDeploymentsPaginator.ts            | 3 ++-
 .../src/pagination/ListEffectiveDeploymentsPaginator.ts   | 3 ++-
 .../src/pagination/ListInstalledComponentsPaginator.ts    | 3 ++-
 .../src/pagination/ListConfigsPaginator.ts                | 3 ++-
 .../src/pagination/ListContactsPaginator.ts               | 3 ++-
 .../src/pagination/ListDataflowEndpointGroupsPaginator.ts | 3 ++-
 .../src/pagination/ListGroundStationsPaginator.ts         | 3 ++-
 .../src/pagination/ListMissionProfilesPaginator.ts        | 3 ++-
 .../src/pagination/ListSatellitesPaginator.ts             | 3 ++-
 .../src/pagination/GetUsageStatisticsPaginator.ts         | 3 ++-
 .../src/pagination/ListDetectorsPaginator.ts              | 3 ++-
 .../src/pagination/ListFiltersPaginator.ts                | 3 ++-
 .../src/pagination/ListFindingsPaginator.ts               | 3 ++-
 .../src/pagination/ListIPSetsPaginator.ts                 | 3 ++-
 .../src/pagination/ListInvitationsPaginator.ts            | 3 ++-
 .../src/pagination/ListMembersPaginator.ts                | 3 ++-
 .../pagination/ListOrganizationAdminAccountsPaginator.ts  | 3 ++-
 .../src/pagination/ListPublishingDestinationsPaginator.ts | 3 ++-
 .../src/pagination/ListThreatIntelSetsPaginator.ts        | 3 ++-
 .../DescribeAffectedAccountsForOrganizationPaginator.ts   | 3 ++-
 .../DescribeAffectedEntitiesForOrganizationPaginator.ts   | 3 ++-
 .../src/pagination/DescribeAffectedEntitiesPaginator.ts   | 3 ++-
 .../src/pagination/DescribeEventAggregatesPaginator.ts    | 3 ++-
 .../src/pagination/DescribeEventTypesPaginator.ts         | 3 ++-
 .../pagination/DescribeEventsForOrganizationPaginator.ts  | 3 ++-
 .../src/pagination/DescribeEventsPaginator.ts             | 3 ++-
 .../src/pagination/ListFHIRDatastoresPaginator.ts         | 3 ++-
 .../src/pagination/ListFHIRExportJobsPaginator.ts         | 3 ++-
 .../src/pagination/ListFHIRImportJobsPaginator.ts         | 3 ++-
 .../src/pagination/ListTableColumnsPaginator.ts           | 3 ++-
 .../src/pagination/ListTableRowsPaginator.ts              | 3 ++-
 .../src/pagination/ListTablesPaginator.ts                 | 3 ++-
 .../src/pagination/QueryTableRowsPaginator.ts             | 3 ++-
 .../pagination/GetAccountAuthorizationDetailsPaginator.ts | 3 ++-
 clients/client-iam/src/pagination/GetGroupPaginator.ts    | 3 ++-
 .../client-iam/src/pagination/ListAccessKeysPaginator.ts  | 3 ++-
 .../src/pagination/ListAccountAliasesPaginator.ts         | 3 ++-
 .../src/pagination/ListAttachedGroupPoliciesPaginator.ts  | 3 ++-
 .../src/pagination/ListAttachedRolePoliciesPaginator.ts   | 3 ++-
 .../src/pagination/ListAttachedUserPoliciesPaginator.ts   | 3 ++-
 .../src/pagination/ListEntitiesForPolicyPaginator.ts      | 3 ++-
 .../src/pagination/ListGroupPoliciesPaginator.ts          | 3 ++-
 .../src/pagination/ListGroupsForUserPaginator.ts          | 3 ++-
 clients/client-iam/src/pagination/ListGroupsPaginator.ts  | 3 ++-
 .../pagination/ListInstanceProfilesForRolePaginator.ts    | 3 ++-
 .../src/pagination/ListInstanceProfilesPaginator.ts       | 3 ++-
 .../client-iam/src/pagination/ListMFADevicesPaginator.ts  | 3 ++-
 .../client-iam/src/pagination/ListPoliciesPaginator.ts    | 3 ++-
 .../src/pagination/ListPolicyVersionsPaginator.ts         | 3 ++-
 .../src/pagination/ListRolePoliciesPaginator.ts           | 3 ++-
 clients/client-iam/src/pagination/ListRolesPaginator.ts   | 3 ++-
 .../src/pagination/ListSSHPublicKeysPaginator.ts          | 3 ++-
 .../src/pagination/ListServerCertificatesPaginator.ts     | 3 ++-
 .../src/pagination/ListSigningCertificatesPaginator.ts    | 3 ++-
 .../src/pagination/ListUserPoliciesPaginator.ts           | 3 ++-
 .../client-iam/src/pagination/ListUserTagsPaginator.ts    | 3 ++-
 clients/client-iam/src/pagination/ListUsersPaginator.ts   | 3 ++-
 .../src/pagination/ListVirtualMFADevicesPaginator.ts      | 3 ++-
 .../src/pagination/SimulateCustomPolicyPaginator.ts       | 3 ++-
 .../src/pagination/SimulatePrincipalPolicyPaginator.ts    | 3 ++-
 .../src/pagination/ListGroupsPaginator.ts                 | 3 ++-
 .../src/pagination/ListUsersPaginator.ts                  | 3 ++-
 .../src/pagination/ListComponentBuildVersionsPaginator.ts | 3 ++-
 .../src/pagination/ListComponentsPaginator.ts             | 3 ++-
 .../src/pagination/ListContainerRecipesPaginator.ts       | 3 ++-
 .../pagination/ListDistributionConfigurationsPaginator.ts | 3 ++-
 .../src/pagination/ListImageBuildVersionsPaginator.ts     | 3 ++-
 .../src/pagination/ListImagePackagesPaginator.ts          | 3 ++-
 .../src/pagination/ListImagePipelineImagesPaginator.ts    | 3 ++-
 .../src/pagination/ListImagePipelinesPaginator.ts         | 3 ++-
 .../src/pagination/ListImageRecipesPaginator.ts           | 3 ++-
 .../src/pagination/ListImagesPaginator.ts                 | 3 ++-
 .../ListInfrastructureConfigurationsPaginator.ts          | 3 ++-
 .../src/pagination/GetExclusionsPreviewPaginator.ts       | 3 ++-
 .../src/pagination/ListAssessmentRunAgentsPaginator.ts    | 3 ++-
 .../src/pagination/ListAssessmentRunsPaginator.ts         | 3 ++-
 .../src/pagination/ListAssessmentTargetsPaginator.ts      | 3 ++-
 .../src/pagination/ListAssessmentTemplatesPaginator.ts    | 3 ++-
 .../src/pagination/ListEventSubscriptionsPaginator.ts     | 3 ++-
 .../src/pagination/ListExclusionsPaginator.ts             | 3 ++-
 .../src/pagination/ListFindingsPaginator.ts               | 3 ++-
 .../src/pagination/ListRulesPackagesPaginator.ts          | 3 ++-
 .../src/pagination/PreviewAgentsPaginator.ts              | 3 ++-
 .../src/pagination/ListAccountPermissionsPaginator.ts     | 3 ++-
 .../src/pagination/ListCoveragePaginator.ts               | 3 ++-
 .../src/pagination/ListCoverageStatisticsPaginator.ts     | 3 ++-
 .../src/pagination/ListDelegatedAdminAccountsPaginator.ts | 3 ++-
 .../src/pagination/ListFiltersPaginator.ts                | 3 ++-
 .../src/pagination/ListFindingAggregationsPaginator.ts    | 3 ++-
 .../src/pagination/ListFindingsPaginator.ts               | 3 ++-
 .../src/pagination/ListMembersPaginator.ts                | 3 ++-
 .../src/pagination/ListUsageTotalsPaginator.ts            | 3 ++-
 .../src/pagination/ListPlacementsPaginator.ts             | 3 ++-
 .../src/pagination/ListProjectsPaginator.ts               | 3 ++-
 .../src/pagination/ListRetainedMessagesPaginator.ts       | 3 ++-
 .../src/pagination/ListDestinationsPaginator.ts           | 3 ++-
 .../src/pagination/ListDeviceProfilesPaginator.ts         | 3 ++-
 .../src/pagination/ListFuotaTasksPaginator.ts             | 3 ++-
 .../pagination/ListMulticastGroupsByFuotaTaskPaginator.ts | 3 ++-
 .../src/pagination/ListMulticastGroupsPaginator.ts        | 3 ++-
 .../src/pagination/ListQueuedMessagesPaginator.ts         | 3 ++-
 .../src/pagination/ListServiceProfilesPaginator.ts        | 3 ++-
 .../src/pagination/ListWirelessDevicesPaginator.ts        | 3 ++-
 .../src/pagination/ListWirelessGatewaysPaginator.ts       | 3 ++-
 .../GetBehaviorModelTrainingSummariesPaginator.ts         | 3 ++-
 .../src/pagination/ListActiveViolationsPaginator.ts       | 3 ++-
 .../src/pagination/ListAttachedPoliciesPaginator.ts       | 3 ++-
 .../src/pagination/ListAuditFindingsPaginator.ts          | 3 ++-
 .../ListAuditMitigationActionsExecutionsPaginator.ts      | 3 ++-
 .../ListAuditMitigationActionsTasksPaginator.ts           | 3 ++-
 .../src/pagination/ListAuditSuppressionsPaginator.ts      | 3 ++-
 .../client-iot/src/pagination/ListAuditTasksPaginator.ts  | 3 ++-
 .../client-iot/src/pagination/ListAuthorizersPaginator.ts | 3 ++-
 .../src/pagination/ListBillingGroupsPaginator.ts          | 3 ++-
 .../src/pagination/ListCACertificatesPaginator.ts         | 3 ++-
 .../src/pagination/ListCertificatesByCAPaginator.ts       | 3 ++-
 .../src/pagination/ListCertificatesPaginator.ts           | 3 ++-
 .../src/pagination/ListCustomMetricsPaginator.ts          | 3 ++-
 .../ListDetectMitigationActionsExecutionsPaginator.ts     | 3 ++-
 .../ListDetectMitigationActionsTasksPaginator.ts          | 3 ++-
 .../client-iot/src/pagination/ListDimensionsPaginator.ts  | 3 ++-
 .../src/pagination/ListDomainConfigurationsPaginator.ts   | 3 ++-
 .../src/pagination/ListFleetMetricsPaginator.ts           | 3 ++-
 clients/client-iot/src/pagination/ListIndicesPaginator.ts | 3 ++-
 .../src/pagination/ListJobExecutionsForJobPaginator.ts    | 3 ++-
 .../src/pagination/ListJobExecutionsForThingPaginator.ts  | 3 ++-
 .../src/pagination/ListJobTemplatesPaginator.ts           | 3 ++-
 clients/client-iot/src/pagination/ListJobsPaginator.ts    | 3 ++-
 .../src/pagination/ListMetricValuesPaginator.ts           | 3 ++-
 .../src/pagination/ListMitigationActionsPaginator.ts      | 3 ++-
 .../client-iot/src/pagination/ListOTAUpdatesPaginator.ts  | 3 ++-
 .../src/pagination/ListOutgoingCertificatesPaginator.ts   | 3 ++-
 .../client-iot/src/pagination/ListPoliciesPaginator.ts    | 3 ++-
 .../src/pagination/ListPolicyPrincipalsPaginator.ts       | 3 ++-
 .../src/pagination/ListPrincipalPoliciesPaginator.ts      | 3 ++-
 .../src/pagination/ListPrincipalThingsPaginator.ts        | 3 ++-
 .../ListProvisioningTemplateVersionsPaginator.ts          | 3 ++-
 .../src/pagination/ListProvisioningTemplatesPaginator.ts  | 3 ++-
 .../client-iot/src/pagination/ListRoleAliasesPaginator.ts | 3 ++-
 .../src/pagination/ListScheduledAuditsPaginator.ts        | 3 ++-
 .../pagination/ListSecurityProfilesForTargetPaginator.ts  | 3 ++-
 .../src/pagination/ListSecurityProfilesPaginator.ts       | 3 ++-
 clients/client-iot/src/pagination/ListStreamsPaginator.ts | 3 ++-
 .../src/pagination/ListTagsForResourcePaginator.ts        | 3 ++-
 .../src/pagination/ListTargetsForPolicyPaginator.ts       | 3 ++-
 .../pagination/ListTargetsForSecurityProfilePaginator.ts  | 3 ++-
 .../src/pagination/ListThingGroupsForThingPaginator.ts    | 3 ++-
 .../client-iot/src/pagination/ListThingGroupsPaginator.ts | 3 ++-
 .../src/pagination/ListThingPrincipalsPaginator.ts        | 3 ++-
 .../ListThingRegistrationTaskReportsPaginator.ts          | 3 ++-
 .../src/pagination/ListThingRegistrationTasksPaginator.ts | 3 ++-
 .../client-iot/src/pagination/ListThingTypesPaginator.ts  | 3 ++-
 .../src/pagination/ListThingsInBillingGroupPaginator.ts   | 3 ++-
 .../src/pagination/ListThingsInThingGroupPaginator.ts     | 3 ++-
 clients/client-iot/src/pagination/ListThingsPaginator.ts  | 3 ++-
 .../src/pagination/ListTopicRuleDestinationsPaginator.ts  | 3 ++-
 .../client-iot/src/pagination/ListTopicRulesPaginator.ts  | 3 ++-
 .../src/pagination/ListV2LoggingLevelsPaginator.ts        | 3 ++-
 .../src/pagination/ListViolationEventsPaginator.ts        | 3 ++-
 .../src/pagination/ListChannelsPaginator.ts               | 3 ++-
 .../src/pagination/ListDatasetContentsPaginator.ts        | 3 ++-
 .../src/pagination/ListDatasetsPaginator.ts               | 3 ++-
 .../src/pagination/ListDatastoresPaginator.ts             | 3 ++-
 .../src/pagination/ListPipelinesPaginator.ts              | 3 ++-
 .../src/pagination/ListSuiteDefinitionsPaginator.ts       | 3 ++-
 .../src/pagination/ListSuiteRunsPaginator.ts              | 3 ++-
 .../src/pagination/ListApplicationsPaginator.ts           | 3 ++-
 .../src/pagination/ListTunnelsPaginator.ts                | 3 ++-
 .../src/pagination/GetAssetPropertyAggregatesPaginator.ts | 3 ++-
 .../pagination/GetAssetPropertyValueHistoryPaginator.ts   | 3 ++-
 .../GetInterpolatedAssetPropertyValuesPaginator.ts        | 3 ++-
 .../src/pagination/ListAccessPoliciesPaginator.ts         | 3 ++-
 .../src/pagination/ListAssetModelsPaginator.ts            | 3 ++-
 .../src/pagination/ListAssetRelationshipsPaginator.ts     | 3 ++-
 .../src/pagination/ListAssetsPaginator.ts                 | 3 ++-
 .../src/pagination/ListAssociatedAssetsPaginator.ts       | 3 ++-
 .../src/pagination/ListDashboardsPaginator.ts             | 3 ++-
 .../src/pagination/ListGatewaysPaginator.ts               | 3 ++-
 .../src/pagination/ListPortalsPaginator.ts                | 3 ++-
 .../src/pagination/ListProjectAssetsPaginator.ts          | 3 ++-
 .../src/pagination/ListProjectsPaginator.ts               | 3 ++-
 .../src/pagination/ListTimeSeriesPaginator.ts             | 3 ++-
 .../src/pagination/GetFlowTemplateRevisionsPaginator.ts   | 3 ++-
 .../src/pagination/GetSystemTemplateRevisionsPaginator.ts | 3 ++-
 .../src/pagination/ListFlowExecutionMessagesPaginator.ts  | 3 ++-
 .../src/pagination/ListTagsForResourcePaginator.ts        | 3 ++-
 .../src/pagination/SearchEntitiesPaginator.ts             | 3 ++-
 .../src/pagination/SearchFlowExecutionsPaginator.ts       | 3 ++-
 .../src/pagination/SearchFlowTemplatesPaginator.ts        | 3 ++-
 .../src/pagination/SearchSystemInstancesPaginator.ts      | 3 ++-
 .../src/pagination/SearchSystemTemplatesPaginator.ts      | 3 ++-
 .../src/pagination/SearchThingsPaginator.ts               | 3 ++-
 .../src/pagination/GetPropertyValueHistoryPaginator.ts    | 3 ++-
 .../src/pagination/ListComponentTypesPaginator.ts         | 3 ++-
 .../src/pagination/ListEntitiesPaginator.ts               | 3 ++-
 .../src/pagination/ListScenesPaginator.ts                 | 3 ++-
 .../src/pagination/ListWorkspacesPaginator.ts             | 3 ++-
 .../client-ivs/src/pagination/ListChannelsPaginator.ts    | 3 ++-
 .../src/pagination/ListPlaybackKeyPairsPaginator.ts       | 3 ++-
 .../pagination/ListRecordingConfigurationsPaginator.ts    | 3 ++-
 .../client-ivs/src/pagination/ListStreamKeysPaginator.ts  | 3 ++-
 .../src/pagination/ListStreamSessionsPaginator.ts         | 3 ++-
 clients/client-ivs/src/pagination/ListStreamsPaginator.ts | 3 ++-
 .../src/pagination/ListClusterOperationsPaginator.ts      | 3 ++-
 .../client-kafka/src/pagination/ListClustersPaginator.ts  | 3 ++-
 .../src/pagination/ListClustersV2Paginator.ts             | 3 ++-
 .../src/pagination/ListConfigurationRevisionsPaginator.ts | 3 ++-
 .../src/pagination/ListConfigurationsPaginator.ts         | 3 ++-
 .../src/pagination/ListKafkaVersionsPaginator.ts          | 3 ++-
 clients/client-kafka/src/pagination/ListNodesPaginator.ts | 3 ++-
 .../src/pagination/ListScramSecretsPaginator.ts           | 3 ++-
 .../src/pagination/ListConnectorsPaginator.ts             | 3 ++-
 .../src/pagination/ListCustomPluginsPaginator.ts          | 3 ++-
 .../src/pagination/ListWorkerConfigurationsPaginator.ts   | 3 ++-
 .../client-kendra/src/pagination/GetSnapshotsPaginator.ts | 3 ++-
 .../src/pagination/ListDataSourceSyncJobsPaginator.ts     | 3 ++-
 .../src/pagination/ListDataSourcesPaginator.ts            | 3 ++-
 .../src/pagination/ListEntityPersonasPaginator.ts         | 3 ++-
 .../src/pagination/ListExperienceEntitiesPaginator.ts     | 3 ++-
 .../src/pagination/ListExperiencesPaginator.ts            | 3 ++-
 .../client-kendra/src/pagination/ListIndicesPaginator.ts  | 3 ++-
 .../src/pagination/ListKeyspacesPaginator.ts              | 3 ++-
 .../src/pagination/ListTablesPaginator.ts                 | 3 ++-
 .../src/pagination/ListTagsForResourcePaginator.ts        | 3 ++-
 .../src/pagination/ListSignalingChannelsPaginator.ts      | 3 ++-
 .../src/pagination/ListStreamsPaginator.ts                | 3 ++-
 .../src/pagination/ListStreamConsumersPaginator.ts        | 3 ++-
 clients/client-kms/src/pagination/ListAliasesPaginator.ts | 3 ++-
 clients/client-kms/src/pagination/ListGrantsPaginator.ts  | 3 ++-
 .../client-kms/src/pagination/ListKeyPoliciesPaginator.ts | 3 ++-
 clients/client-kms/src/pagination/ListKeysPaginator.ts    | 3 ++-
 .../pagination/GetEffectivePermissionsForPathPaginator.ts | 3 ++-
 .../src/pagination/GetTableObjectsPaginator.ts            | 3 ++-
 .../src/pagination/GetWorkUnitsPaginator.ts               | 3 ++-
 .../src/pagination/ListDataCellsFilterPaginator.ts        | 3 ++-
 .../src/pagination/ListLFTagsPaginator.ts                 | 3 ++-
 .../src/pagination/ListPermissionsPaginator.ts            | 3 ++-
 .../src/pagination/ListResourcesPaginator.ts              | 3 ++-
 .../src/pagination/ListTableStorageOptimizersPaginator.ts | 3 ++-
 .../src/pagination/ListTransactionsPaginator.ts           | 3 ++-
 .../src/pagination/SearchDatabasesByLFTagsPaginator.ts    | 3 ++-
 .../src/pagination/SearchTablesByLFTagsPaginator.ts       | 3 ++-
 .../client-lambda/src/pagination/ListAliasesPaginator.ts  | 3 ++-
 .../src/pagination/ListCodeSigningConfigsPaginator.ts     | 3 ++-
 .../src/pagination/ListEventSourceMappingsPaginator.ts    | 3 ++-
 .../pagination/ListFunctionEventInvokeConfigsPaginator.ts | 3 ++-
 .../src/pagination/ListFunctionUrlConfigsPaginator.ts     | 3 ++-
 .../ListFunctionsByCodeSigningConfigPaginator.ts          | 3 ++-
 .../src/pagination/ListFunctionsPaginator.ts              | 3 ++-
 .../src/pagination/ListLayerVersionsPaginator.ts          | 3 ++-
 .../client-lambda/src/pagination/ListLayersPaginator.ts   | 3 ++-
 .../ListProvisionedConcurrencyConfigsPaginator.ts         | 3 ++-
 .../src/pagination/ListVersionsByFunctionPaginator.ts     | 3 ++-
 .../src/pagination/GetBotAliasesPaginator.ts              | 3 ++-
 .../src/pagination/GetBotChannelAssociationsPaginator.ts  | 3 ++-
 .../src/pagination/GetBotVersionsPaginator.ts             | 3 ++-
 .../src/pagination/GetBotsPaginator.ts                    | 3 ++-
 .../src/pagination/GetBuiltinIntentsPaginator.ts          | 3 ++-
 .../src/pagination/GetBuiltinSlotTypesPaginator.ts        | 3 ++-
 .../src/pagination/GetIntentVersionsPaginator.ts          | 3 ++-
 .../src/pagination/GetIntentsPaginator.ts                 | 3 ++-
 .../src/pagination/GetMigrationsPaginator.ts              | 3 ++-
 .../src/pagination/GetSlotTypeVersionsPaginator.ts        | 3 ++-
 .../src/pagination/GetSlotTypesPaginator.ts               | 3 ++-
 .../src/pagination/ListAggregatedUtterancesPaginator.ts   | 3 ++-
 .../src/pagination/ListBotAliasesPaginator.ts             | 3 ++-
 .../src/pagination/ListBotLocalesPaginator.ts             | 3 ++-
 .../src/pagination/ListBotRecommendationsPaginator.ts     | 3 ++-
 .../src/pagination/ListBotVersionsPaginator.ts            | 3 ++-
 .../src/pagination/ListBotsPaginator.ts                   | 3 ++-
 .../src/pagination/ListBuiltInIntentsPaginator.ts         | 3 ++-
 .../src/pagination/ListBuiltInSlotTypesPaginator.ts       | 3 ++-
 .../src/pagination/ListExportsPaginator.ts                | 3 ++-
 .../src/pagination/ListImportsPaginator.ts                | 3 ++-
 .../src/pagination/ListIntentsPaginator.ts                | 3 ++-
 .../src/pagination/ListRecommendedIntentsPaginator.ts     | 3 ++-
 .../src/pagination/ListSlotTypesPaginator.ts              | 3 ++-
 .../src/pagination/ListSlotsPaginator.ts                  | 3 ++-
 .../src/pagination/GetDevicePositionHistoryPaginator.ts   | 3 ++-
 .../src/pagination/ListDevicePositionsPaginator.ts        | 3 ++-
 .../src/pagination/ListGeofenceCollectionsPaginator.ts    | 3 ++-
 .../src/pagination/ListGeofencesPaginator.ts              | 3 ++-
 .../client-location/src/pagination/ListMapsPaginator.ts   | 3 ++-
 .../src/pagination/ListPlaceIndexesPaginator.ts           | 3 ++-
 .../src/pagination/ListRouteCalculatorsPaginator.ts       | 3 ++-
 .../src/pagination/ListTrackerConsumersPaginator.ts       | 3 ++-
 .../src/pagination/ListTrackersPaginator.ts               | 3 ++-
 .../src/pagination/ListDataIngestionJobsPaginator.ts      | 3 ++-
 .../src/pagination/ListDatasetsPaginator.ts               | 3 ++-
 .../src/pagination/ListInferenceExecutionsPaginator.ts    | 3 ++-
 .../src/pagination/ListInferenceSchedulersPaginator.ts    | 3 ++-
 .../src/pagination/ListModelsPaginator.ts                 | 3 ++-
 .../DescribeAnomalyDetectionExecutionsPaginator.ts        | 3 ++-
 .../src/pagination/GetFeedbackPaginator.ts                | 3 ++-
 .../src/pagination/ListAlertsPaginator.ts                 | 3 ++-
 .../src/pagination/ListAnomalyDetectorsPaginator.ts       | 3 ++-
 .../pagination/ListAnomalyGroupRelatedMetricsPaginator.ts | 3 ++-
 .../src/pagination/ListAnomalyGroupSummariesPaginator.ts  | 3 ++-
 .../src/pagination/ListAnomalyGroupTimeSeriesPaginator.ts | 3 ++-
 .../src/pagination/ListMetricSetsPaginator.ts             | 3 ++-
 .../src/pagination/ListDatasetEntriesPaginator.ts         | 3 ++-
 .../src/pagination/ListModelPackagingJobsPaginator.ts     | 3 ++-
 .../src/pagination/ListModelsPaginator.ts                 | 3 ++-
 .../src/pagination/ListProjectsPaginator.ts               | 3 ++-
 .../src/pagination/DescribeBatchPredictionsPaginator.ts   | 3 ++-
 .../src/pagination/DescribeDataSourcesPaginator.ts        | 3 ++-
 .../src/pagination/DescribeEvaluationsPaginator.ts        | 3 ++-
 .../src/pagination/DescribeMLModelsPaginator.ts           | 3 ++-
 .../src/pagination/ListMemberAccountsPaginator.ts         | 3 ++-
 .../src/pagination/ListS3ResourcesPaginator.ts            | 3 ++-
 .../src/pagination/DescribeBucketsPaginator.ts            | 3 ++-
 .../src/pagination/GetUsageStatisticsPaginator.ts         | 3 ++-
 .../src/pagination/ListClassificationJobsPaginator.ts     | 3 ++-
 .../src/pagination/ListCustomDataIdentifiersPaginator.ts  | 3 ++-
 .../src/pagination/ListFindingsFiltersPaginator.ts        | 3 ++-
 .../client-macie2/src/pagination/ListFindingsPaginator.ts | 3 ++-
 .../src/pagination/ListInvitationsPaginator.ts            | 3 ++-
 .../client-macie2/src/pagination/ListMembersPaginator.ts  | 3 ++-
 .../pagination/ListOrganizationAdminAccountsPaginator.ts  | 3 ++-
 .../src/pagination/SearchResourcesPaginator.ts            | 3 ++-
 .../src/pagination/ListInvitationsPaginator.ts            | 3 ++-
 .../src/pagination/ListMembersPaginator.ts                | 3 ++-
 .../src/pagination/ListNetworksPaginator.ts               | 3 ++-
 .../src/pagination/ListNodesPaginator.ts                  | 3 ++-
 .../src/pagination/ListProposalVotesPaginator.ts          | 3 ++-
 .../src/pagination/ListProposalsPaginator.ts              | 3 ++-
 .../src/pagination/ListChangeSetsPaginator.ts             | 3 ++-
 .../src/pagination/ListEntitiesPaginator.ts               | 3 ++-
 .../src/pagination/ListEntitlementsPaginator.ts           | 3 ++-
 .../src/pagination/ListFlowsPaginator.ts                  | 3 ++-
 .../src/pagination/ListOfferingsPaginator.ts              | 3 ++-
 .../src/pagination/ListReservationsPaginator.ts           | 3 ++-
 .../src/pagination/DescribeEndpointsPaginator.ts          | 3 ++-
 .../src/pagination/ListJobTemplatesPaginator.ts           | 3 ++-
 .../src/pagination/ListJobsPaginator.ts                   | 3 ++-
 .../src/pagination/ListPresetsPaginator.ts                | 3 ++-
 .../src/pagination/ListQueuesPaginator.ts                 | 3 ++-
 .../src/pagination/DescribeSchedulePaginator.ts           | 3 ++-
 .../src/pagination/ListChannelsPaginator.ts               | 3 ++-
 .../src/pagination/ListInputDeviceTransfersPaginator.ts   | 3 ++-
 .../src/pagination/ListInputDevicesPaginator.ts           | 3 ++-
 .../src/pagination/ListInputSecurityGroupsPaginator.ts    | 3 ++-
 .../src/pagination/ListInputsPaginator.ts                 | 3 ++-
 .../src/pagination/ListMultiplexProgramsPaginator.ts      | 3 ++-
 .../src/pagination/ListMultiplexesPaginator.ts            | 3 ++-
 .../src/pagination/ListOfferingsPaginator.ts              | 3 ++-
 .../src/pagination/ListReservationsPaginator.ts           | 3 ++-
 .../src/pagination/ListAssetsPaginator.ts                 | 3 ++-
 .../pagination/ListPackagingConfigurationsPaginator.ts    | 3 ++-
 .../src/pagination/ListPackagingGroupsPaginator.ts        | 3 ++-
 .../src/pagination/ListChannelsPaginator.ts               | 3 ++-
 .../src/pagination/ListHarvestJobsPaginator.ts            | 3 ++-
 .../src/pagination/ListOriginEndpointsPaginator.ts        | 3 ++-
 .../src/pagination/ListItemsPaginator.ts                  | 3 ++-
 .../src/pagination/ListContainersPaginator.ts             | 3 ++-
 .../src/pagination/GetChannelSchedulePaginator.ts         | 3 ++-
 .../src/pagination/ListAlertsPaginator.ts                 | 3 ++-
 .../src/pagination/ListChannelsPaginator.ts               | 3 ++-
 .../src/pagination/ListPlaybackConfigurationsPaginator.ts | 3 ++-
 .../src/pagination/ListPrefetchSchedulesPaginator.ts      | 3 ++-
 .../src/pagination/ListSourceLocationsPaginator.ts        | 3 ++-
 .../src/pagination/ListVodSourcesPaginator.ts             | 3 ++-
 .../src/pagination/DescribeJobLogItemsPaginator.ts        | 3 ++-
 .../client-mgn/src/pagination/DescribeJobsPaginator.ts    | 3 ++-
 .../DescribeReplicationConfigurationTemplatesPaginator.ts | 3 ++-
 .../src/pagination/DescribeSourceServersPaginator.ts      | 3 ++-
 .../src/pagination/DescribeVcenterClientsPaginator.ts     | 3 ++-
 .../src/pagination/ListApplicationsPaginator.ts           | 3 ++-
 .../src/pagination/ListEnvironmentVpcsPaginator.ts        | 3 ++-
 .../src/pagination/ListEnvironmentsPaginator.ts           | 3 ++-
 .../src/pagination/ListRoutesPaginator.ts                 | 3 ++-
 .../src/pagination/ListServicesPaginator.ts               | 3 ++-
 .../src/pagination/ListApplicationStatesPaginator.ts      | 3 ++-
 .../src/pagination/ListCreatedArtifactsPaginator.ts       | 3 ++-
 .../src/pagination/ListDiscoveredResourcesPaginator.ts    | 3 ++-
 .../src/pagination/ListMigrationTasksPaginator.ts         | 3 ++-
 .../src/pagination/ListProgressUpdateStreamsPaginator.ts  | 3 ++-
 .../src/pagination/DescribeHomeRegionControlsPaginator.ts | 3 ++-
 .../src/pagination/GetServerDetailsPaginator.ts           | 3 ++-
 .../src/pagination/ListApplicationComponentsPaginator.ts  | 3 ++-
 .../src/pagination/ListCollectorsPaginator.ts             | 3 ++-
 .../src/pagination/ListImportFileTaskPaginator.ts         | 3 ++-
 .../src/pagination/ListServersPaginator.ts                | 3 ++-
 .../client-mobile/src/pagination/ListBundlesPaginator.ts  | 3 ++-
 .../client-mobile/src/pagination/ListProjectsPaginator.ts | 3 ++-
 clients/client-mq/src/pagination/ListBrokersPaginator.ts  | 3 ++-
 .../src/pagination/ListAssignmentsForHITPaginator.ts      | 3 ++-
 .../src/pagination/ListBonusPaymentsPaginator.ts          | 3 ++-
 .../pagination/ListHITsForQualificationTypePaginator.ts   | 3 ++-
 clients/client-mturk/src/pagination/ListHITsPaginator.ts  | 3 ++-
 .../src/pagination/ListQualificationRequestsPaginator.ts  | 3 ++-
 .../src/pagination/ListQualificationTypesPaginator.ts     | 3 ++-
 .../pagination/ListReviewPolicyResultsForHITPaginator.ts  | 3 ++-
 .../src/pagination/ListReviewableHITsPaginator.ts         | 3 ++-
 .../src/pagination/ListWorkerBlocksPaginator.ts           | 3 ++-
 .../ListWorkersWithQualificationTypePaginator.ts          | 3 ++-
 .../src/pagination/ListEnvironmentsPaginator.ts           | 3 ++-
 .../src/pagination/DescribeDBClusterEndpointsPaginator.ts | 3 ++-
 .../DescribeDBClusterParameterGroupsPaginator.ts          | 3 ++-
 .../pagination/DescribeDBClusterParametersPaginator.ts    | 3 ++-
 .../src/pagination/DescribeDBClusterSnapshotsPaginator.ts | 3 ++-
 .../src/pagination/DescribeDBClustersPaginator.ts         | 3 ++-
 .../src/pagination/DescribeDBEngineVersionsPaginator.ts   | 3 ++-
 .../src/pagination/DescribeDBInstancesPaginator.ts        | 3 ++-
 .../src/pagination/DescribeDBParameterGroupsPaginator.ts  | 3 ++-
 .../src/pagination/DescribeDBParametersPaginator.ts       | 3 ++-
 .../src/pagination/DescribeDBSubnetGroupsPaginator.ts     | 3 ++-
 .../DescribeEngineDefaultParametersPaginator.ts           | 3 ++-
 .../src/pagination/DescribeEventSubscriptionsPaginator.ts | 3 ++-
 .../src/pagination/DescribeEventsPaginator.ts             | 3 ++-
 .../DescribeOrderableDBInstanceOptionsPaginator.ts        | 3 ++-
 .../DescribePendingMaintenanceActionsPaginator.ts         | 3 ++-
 .../src/pagination/ListFirewallPoliciesPaginator.ts       | 3 ++-
 .../src/pagination/ListFirewallsPaginator.ts              | 3 ++-
 .../src/pagination/ListRuleGroupsPaginator.ts             | 3 ++-
 .../src/pagination/ListTagsForResourcePaginator.ts        | 3 ++-
 .../src/pagination/DescribeGlobalNetworksPaginator.ts     | 3 ++-
 .../src/pagination/GetConnectPeerAssociationsPaginator.ts | 3 ++-
 .../src/pagination/GetConnectionsPaginator.ts             | 3 ++-
 .../src/pagination/GetCoreNetworkChangeSetPaginator.ts    | 3 ++-
 .../pagination/GetCustomerGatewayAssociationsPaginator.ts | 3 ++-
 .../src/pagination/GetDevicesPaginator.ts                 | 3 ++-
 .../src/pagination/GetLinkAssociationsPaginator.ts        | 3 ++-
 .../src/pagination/GetLinksPaginator.ts                   | 3 ++-
 .../src/pagination/GetNetworkResourceCountsPaginator.ts   | 3 ++-
 .../GetNetworkResourceRelationshipsPaginator.ts           | 3 ++-
 .../src/pagination/GetNetworkResourcesPaginator.ts        | 3 ++-
 .../src/pagination/GetNetworkTelemetryPaginator.ts        | 3 ++-
 .../src/pagination/GetSitesPaginator.ts                   | 3 ++-
 .../GetTransitGatewayConnectPeerAssociationsPaginator.ts  | 3 ++-
 .../pagination/GetTransitGatewayRegistrationsPaginator.ts | 3 ++-
 .../src/pagination/ListAttachmentsPaginator.ts            | 3 ++-
 .../src/pagination/ListConnectPeersPaginator.ts           | 3 ++-
 .../pagination/ListCoreNetworkPolicyVersionsPaginator.ts  | 3 ++-
 .../src/pagination/ListCoreNetworksPaginator.ts           | 3 ++-
 .../src/pagination/ListEulaAcceptancesPaginator.ts        | 3 ++-
 .../client-nimble/src/pagination/ListEulasPaginator.ts    | 3 ++-
 .../src/pagination/ListLaunchProfileMembersPaginator.ts   | 3 ++-
 .../src/pagination/ListLaunchProfilesPaginator.ts         | 3 ++-
 .../src/pagination/ListStreamingImagesPaginator.ts        | 3 ++-
 .../src/pagination/ListStreamingSessionsPaginator.ts      | 3 ++-
 .../src/pagination/ListStudioComponentsPaginator.ts       | 3 ++-
 .../src/pagination/ListStudioMembersPaginator.ts          | 3 ++-
 .../client-nimble/src/pagination/ListStudiosPaginator.ts  | 3 ++-
 .../src/pagination/DescribeDomainAutoTunesPaginator.ts    | 3 ++-
 .../src/pagination/DescribeInboundConnectionsPaginator.ts | 3 ++-
 .../pagination/DescribeOutboundConnectionsPaginator.ts    | 3 ++-
 .../src/pagination/DescribePackagesPaginator.ts           | 3 ++-
 .../DescribeReservedInstanceOfferingsPaginator.ts         | 3 ++-
 .../src/pagination/DescribeReservedInstancesPaginator.ts  | 3 ++-
 .../src/pagination/GetPackageVersionHistoryPaginator.ts   | 3 ++-
 .../src/pagination/GetUpgradeHistoryPaginator.ts          | 3 ++-
 .../src/pagination/ListDomainsForPackagePaginator.ts      | 3 ++-
 .../src/pagination/ListInstanceTypeDetailsPaginator.ts    | 3 ++-
 .../src/pagination/ListPackagesForDomainPaginator.ts      | 3 ++-
 .../src/pagination/ListVersionsPaginator.ts               | 3 ++-
 .../src/pagination/DescribeEcsClustersPaginator.ts        | 3 ++-
 .../src/pagination/DescribeBackupsPaginator.ts            | 3 ++-
 .../src/pagination/DescribeEventsPaginator.ts             | 3 ++-
 .../src/pagination/DescribeServersPaginator.ts            | 3 ++-
 .../src/pagination/ListTagsForResourcePaginator.ts        | 3 ++-
 .../ListAWSServiceAccessForOrganizationPaginator.ts       | 3 ++-
 .../src/pagination/ListAccountsForParentPaginator.ts      | 3 ++-
 .../src/pagination/ListAccountsPaginator.ts               | 3 ++-
 .../src/pagination/ListChildrenPaginator.ts               | 3 ++-
 .../src/pagination/ListCreateAccountStatusPaginator.ts    | 3 ++-
 .../pagination/ListDelegatedAdministratorsPaginator.ts    | 3 ++-
 .../ListDelegatedServicesForAccountPaginator.ts           | 3 ++-
 .../src/pagination/ListHandshakesForAccountPaginator.ts   | 3 ++-
 .../pagination/ListHandshakesForOrganizationPaginator.ts  | 3 ++-
 .../ListOrganizationalUnitsForParentPaginator.ts          | 3 ++-
 .../src/pagination/ListParentsPaginator.ts                | 3 ++-
 .../src/pagination/ListPoliciesForTargetPaginator.ts      | 3 ++-
 .../src/pagination/ListPoliciesPaginator.ts               | 3 ++-
 .../src/pagination/ListRootsPaginator.ts                  | 3 ++-
 .../src/pagination/ListTagsForResourcePaginator.ts        | 3 ++-
 .../src/pagination/ListTargetsForPolicyPaginator.ts       | 3 ++-
 .../src/pagination/ListCatalogItemsPaginator.ts           | 3 ++-
 .../client-outposts/src/pagination/ListOrdersPaginator.ts | 3 ++-
 .../src/pagination/ListOutpostsPaginator.ts               | 3 ++-
 .../client-outposts/src/pagination/ListSitesPaginator.ts  | 3 ++-
 .../ListApplicationInstanceDependenciesPaginator.ts       | 3 ++-
 .../ListApplicationInstanceNodeInstancesPaginator.ts      | 3 ++-
 .../src/pagination/ListApplicationInstancesPaginator.ts   | 3 ++-
 .../src/pagination/ListDevicesJobsPaginator.ts            | 3 ++-
 .../src/pagination/ListDevicesPaginator.ts                | 3 ++-
 .../src/pagination/ListNodeFromTemplateJobsPaginator.ts   | 3 ++-
 .../client-panorama/src/pagination/ListNodesPaginator.ts  | 3 ++-
 .../src/pagination/ListPackageImportJobsPaginator.ts      | 3 ++-
 .../src/pagination/ListPackagesPaginator.ts               | 3 ++-
 .../src/pagination/ListBatchInferenceJobsPaginator.ts     | 3 ++-
 .../src/pagination/ListBatchSegmentJobsPaginator.ts       | 3 ++-
 .../src/pagination/ListCampaignsPaginator.ts              | 3 ++-
 .../src/pagination/ListDatasetExportJobsPaginator.ts      | 3 ++-
 .../src/pagination/ListDatasetGroupsPaginator.ts          | 3 ++-
 .../src/pagination/ListDatasetImportJobsPaginator.ts      | 3 ++-
 .../src/pagination/ListDatasetsPaginator.ts               | 3 ++-
 .../src/pagination/ListEventTrackersPaginator.ts          | 3 ++-
 .../src/pagination/ListFiltersPaginator.ts                | 3 ++-
 .../src/pagination/ListRecipesPaginator.ts                | 3 ++-
 .../src/pagination/ListRecommendersPaginator.ts           | 3 ++-
 .../src/pagination/ListSchemasPaginator.ts                | 3 ++-
 .../src/pagination/ListSolutionVersionsPaginator.ts       | 3 ++-
 .../src/pagination/ListSolutionsPaginator.ts              | 3 ++-
 .../src/pagination/DescribeDimensionKeysPaginator.ts      | 3 ++-
 .../src/pagination/GetResourceMetricsPaginator.ts         | 3 ++-
 .../ListAvailableResourceDimensionsPaginator.ts           | 3 ++-
 .../pagination/ListAvailableResourceMetricsPaginator.ts   | 3 ++-
 .../src/pagination/GetDedicatedIpsPaginator.ts            | 3 ++-
 .../src/pagination/ListConfigurationSetsPaginator.ts      | 3 ++-
 .../src/pagination/ListDedicatedIpPoolsPaginator.ts       | 3 ++-
 .../pagination/ListDeliverabilityTestReportsPaginator.ts  | 3 ++-
 .../ListDomainDeliverabilityCampaignsPaginator.ts         | 3 ++-
 .../src/pagination/ListEmailIdentitiesPaginator.ts        | 3 ++-
 .../src/pagination/DescribeAccountAttributesPaginator.ts  | 3 ++-
 .../src/pagination/DescribeAccountLimitsPaginator.ts      | 3 ++-
 .../src/pagination/DescribeConfigurationSetsPaginator.ts  | 3 ++-
 .../src/pagination/DescribeKeywordsPaginator.ts           | 3 ++-
 .../src/pagination/DescribeOptOutListsPaginator.ts        | 3 ++-
 .../src/pagination/DescribeOptedOutNumbersPaginator.ts    | 3 ++-
 .../src/pagination/DescribePhoneNumbersPaginator.ts       | 3 ++-
 .../src/pagination/DescribePoolsPaginator.ts              | 3 ++-
 .../src/pagination/DescribeSenderIdsPaginator.ts          | 3 ++-
 .../src/pagination/DescribeSpendLimitsPaginator.ts        | 3 ++-
 .../pagination/ListPoolOriginationIdentitiesPaginator.ts  | 3 ++-
 .../src/pagination/ListSpeechSynthesisTasksPaginator.ts   | 3 ++-
 .../src/pagination/DescribeServicesPaginator.ts           | 3 ++-
 .../src/pagination/GetAttributeValuesPaginator.ts         | 3 ++-
 .../client-pricing/src/pagination/GetProductsPaginator.ts | 3 ++-
 .../ListEnvironmentAccountConnectionsPaginator.ts         | 3 ++-
 .../src/pagination/ListEnvironmentOutputsPaginator.ts     | 3 ++-
 .../ListEnvironmentProvisionedResourcesPaginator.ts       | 3 ++-
 .../ListEnvironmentTemplateVersionsPaginator.ts           | 3 ++-
 .../src/pagination/ListEnvironmentTemplatesPaginator.ts   | 3 ++-
 .../src/pagination/ListEnvironmentsPaginator.ts           | 3 ++-
 .../src/pagination/ListRepositoriesPaginator.ts           | 3 ++-
 .../pagination/ListRepositorySyncDefinitionsPaginator.ts  | 3 ++-
 .../src/pagination/ListServiceInstanceOutputsPaginator.ts | 3 ++-
 .../ListServiceInstanceProvisionedResourcesPaginator.ts   | 3 ++-
 .../src/pagination/ListServiceInstancesPaginator.ts       | 3 ++-
 .../src/pagination/ListServicePipelineOutputsPaginator.ts | 3 ++-
 .../ListServicePipelineProvisionedResourcesPaginator.ts   | 3 ++-
 .../pagination/ListServiceTemplateVersionsPaginator.ts    | 3 ++-
 .../src/pagination/ListServiceTemplatesPaginator.ts       | 3 ++-
 .../client-proton/src/pagination/ListServicesPaginator.ts | 3 ++-
 .../src/pagination/ListTagsForResourcePaginator.ts        | 3 ++-
 .../ListJournalKinesisStreamsForLedgerPaginator.ts        | 3 ++-
 .../pagination/ListJournalS3ExportsForLedgerPaginator.ts  | 3 ++-
 .../src/pagination/ListJournalS3ExportsPaginator.ts       | 3 ++-
 .../client-qldb/src/pagination/ListLedgersPaginator.ts    | 3 ++-
 .../src/pagination/ListAnalysesPaginator.ts               | 3 ++-
 .../src/pagination/ListDashboardVersionsPaginator.ts      | 3 ++-
 .../src/pagination/ListDashboardsPaginator.ts             | 3 ++-
 .../src/pagination/ListDataSetsPaginator.ts               | 3 ++-
 .../src/pagination/ListDataSourcesPaginator.ts            | 3 ++-
 .../src/pagination/ListIngestionsPaginator.ts             | 3 ++-
 .../src/pagination/ListNamespacesPaginator.ts             | 3 ++-
 .../src/pagination/ListTemplateAliasesPaginator.ts        | 3 ++-
 .../src/pagination/ListTemplateVersionsPaginator.ts       | 3 ++-
 .../src/pagination/ListTemplatesPaginator.ts              | 3 ++-
 .../src/pagination/ListThemeVersionsPaginator.ts          | 3 ++-
 .../src/pagination/ListThemesPaginator.ts                 | 3 ++-
 .../src/pagination/SearchAnalysesPaginator.ts             | 3 ++-
 .../src/pagination/SearchDashboardsPaginator.ts           | 3 ++-
 .../src/pagination/GetResourcePoliciesPaginator.ts        | 3 ++-
 .../pagination/GetResourceShareAssociationsPaginator.ts   | 3 ++-
 .../pagination/GetResourceShareInvitationsPaginator.ts    | 3 ++-
 .../src/pagination/GetResourceSharesPaginator.ts          | 3 ++-
 .../pagination/ListPendingInvitationResourcesPaginator.ts | 3 ++-
 .../src/pagination/ListPermissionVersionsPaginator.ts     | 3 ++-
 .../client-ram/src/pagination/ListPermissionsPaginator.ts | 3 ++-
 .../client-ram/src/pagination/ListPrincipalsPaginator.ts  | 3 ++-
 .../pagination/ListResourceSharePermissionsPaginator.ts   | 3 ++-
 .../src/pagination/ListResourceTypesPaginator.ts          | 3 ++-
 .../client-ram/src/pagination/ListResourcesPaginator.ts   | 3 ++-
 clients/client-rbin/src/pagination/ListRulesPaginator.ts  | 3 ++-
 .../src/pagination/DescribeCertificatesPaginator.ts       | 3 ++-
 .../pagination/DescribeDBClusterBacktracksPaginator.ts    | 3 ++-
 .../src/pagination/DescribeDBClusterEndpointsPaginator.ts | 3 ++-
 .../DescribeDBClusterParameterGroupsPaginator.ts          | 3 ++-
 .../pagination/DescribeDBClusterParametersPaginator.ts    | 3 ++-
 .../src/pagination/DescribeDBClusterSnapshotsPaginator.ts | 3 ++-
 .../src/pagination/DescribeDBClustersPaginator.ts         | 3 ++-
 .../src/pagination/DescribeDBEngineVersionsPaginator.ts   | 3 ++-
 .../DescribeDBInstanceAutomatedBackupsPaginator.ts        | 3 ++-
 .../src/pagination/DescribeDBInstancesPaginator.ts        | 3 ++-
 .../src/pagination/DescribeDBLogFilesPaginator.ts         | 3 ++-
 .../src/pagination/DescribeDBParameterGroupsPaginator.ts  | 3 ++-
 .../src/pagination/DescribeDBParametersPaginator.ts       | 3 ++-
 .../src/pagination/DescribeDBProxiesPaginator.ts          | 3 ++-
 .../src/pagination/DescribeDBProxyEndpointsPaginator.ts   | 3 ++-
 .../pagination/DescribeDBProxyTargetGroupsPaginator.ts    | 3 ++-
 .../src/pagination/DescribeDBProxyTargetsPaginator.ts     | 3 ++-
 .../src/pagination/DescribeDBSecurityGroupsPaginator.ts   | 3 ++-
 .../src/pagination/DescribeDBSnapshotsPaginator.ts        | 3 ++-
 .../src/pagination/DescribeDBSubnetGroupsPaginator.ts     | 3 ++-
 .../DescribeEngineDefaultParametersPaginator.ts           | 3 ++-
 .../src/pagination/DescribeEventSubscriptionsPaginator.ts | 3 ++-
 .../client-rds/src/pagination/DescribeEventsPaginator.ts  | 3 ++-
 .../src/pagination/DescribeExportTasksPaginator.ts        | 3 ++-
 .../src/pagination/DescribeGlobalClustersPaginator.ts     | 3 ++-
 .../src/pagination/DescribeOptionGroupOptionsPaginator.ts | 3 ++-
 .../src/pagination/DescribeOptionGroupsPaginator.ts       | 3 ++-
 .../DescribeOrderableDBInstanceOptionsPaginator.ts        | 3 ++-
 .../DescribePendingMaintenanceActionsPaginator.ts         | 3 ++-
 .../DescribeReservedDBInstancesOfferingsPaginator.ts      | 3 ++-
 .../pagination/DescribeReservedDBInstancesPaginator.ts    | 3 ++-
 .../src/pagination/DescribeSourceRegionsPaginator.ts      | 3 ++-
 .../src/pagination/DownloadDBLogFilePortionPaginator.ts   | 3 ++-
 .../src/pagination/DescribeTablePaginator.ts              | 3 ++-
 .../src/pagination/GetStatementResultPaginator.ts         | 3 ++-
 .../src/pagination/ListDatabasesPaginator.ts              | 3 ++-
 .../src/pagination/ListSchemasPaginator.ts                | 3 ++-
 .../src/pagination/ListStatementsPaginator.ts             | 3 ++-
 .../src/pagination/ListTablesPaginator.ts                 | 3 ++-
 .../src/pagination/DescribeClusterDbRevisionsPaginator.ts | 3 ++-
 .../pagination/DescribeClusterParameterGroupsPaginator.ts | 3 ++-
 .../src/pagination/DescribeClusterParametersPaginator.ts  | 3 ++-
 .../pagination/DescribeClusterSecurityGroupsPaginator.ts  | 3 ++-
 .../src/pagination/DescribeClusterSnapshotsPaginator.ts   | 3 ++-
 .../pagination/DescribeClusterSubnetGroupsPaginator.ts    | 3 ++-
 .../src/pagination/DescribeClusterTracksPaginator.ts      | 3 ++-
 .../src/pagination/DescribeClusterVersionsPaginator.ts    | 3 ++-
 .../src/pagination/DescribeClustersPaginator.ts           | 3 ++-
 .../pagination/DescribeDataSharesForConsumerPaginator.ts  | 3 ++-
 .../pagination/DescribeDataSharesForProducerPaginator.ts  | 3 ++-
 .../src/pagination/DescribeDataSharesPaginator.ts         | 3 ++-
 .../DescribeDefaultClusterParametersPaginator.ts          | 3 ++-
 .../src/pagination/DescribeEndpointAccessPaginator.ts     | 3 ++-
 .../pagination/DescribeEndpointAuthorizationPaginator.ts  | 3 ++-
 .../src/pagination/DescribeEventSubscriptionsPaginator.ts | 3 ++-
 .../src/pagination/DescribeEventsPaginator.ts             | 3 ++-
 .../pagination/DescribeHsmClientCertificatesPaginator.ts  | 3 ++-
 .../src/pagination/DescribeHsmConfigurationsPaginator.ts  | 3 ++-
 .../DescribeNodeConfigurationOptionsPaginator.ts          | 3 ++-
 .../DescribeOrderableClusterOptionsPaginator.ts           | 3 ++-
 .../DescribeReservedNodeExchangeStatusPaginator.ts        | 3 ++-
 .../pagination/DescribeReservedNodeOfferingsPaginator.ts  | 3 ++-
 .../src/pagination/DescribeReservedNodesPaginator.ts      | 3 ++-
 .../src/pagination/DescribeScheduledActionsPaginator.ts   | 3 ++-
 .../src/pagination/DescribeSnapshotCopyGrantsPaginator.ts | 3 ++-
 .../src/pagination/DescribeSnapshotSchedulesPaginator.ts  | 3 ++-
 .../src/pagination/DescribeTableRestoreStatusPaginator.ts | 3 ++-
 .../src/pagination/DescribeTagsPaginator.ts               | 3 ++-
 .../src/pagination/DescribeUsageLimitsPaginator.ts        | 3 ++-
 ...etReservedNodeExchangeConfigurationOptionsPaginator.ts | 3 ++-
 .../GetReservedNodeExchangeOfferingsPaginator.ts          | 3 ++-
 .../src/pagination/DescribeProjectVersionsPaginator.ts    | 3 ++-
 .../src/pagination/DescribeProjectsPaginator.ts           | 3 ++-
 .../src/pagination/GetCelebrityRecognitionPaginator.ts    | 3 ++-
 .../src/pagination/GetContentModerationPaginator.ts       | 3 ++-
 .../src/pagination/GetFaceDetectionPaginator.ts           | 3 ++-
 .../src/pagination/GetFaceSearchPaginator.ts              | 3 ++-
 .../src/pagination/GetLabelDetectionPaginator.ts          | 3 ++-
 .../src/pagination/GetPersonTrackingPaginator.ts          | 3 ++-
 .../src/pagination/GetSegmentDetectionPaginator.ts        | 3 ++-
 .../src/pagination/GetTextDetectionPaginator.ts           | 3 ++-
 .../src/pagination/ListCollectionsPaginator.ts            | 3 ++-
 .../src/pagination/ListDatasetEntriesPaginator.ts         | 3 ++-
 .../src/pagination/ListDatasetLabelsPaginator.ts          | 3 ++-
 .../src/pagination/ListFacesPaginator.ts                  | 3 ++-
 .../src/pagination/ListStreamProcessorsPaginator.ts       | 3 ++-
 .../src/pagination/ListAlarmRecommendationsPaginator.ts   | 3 ++-
 .../src/pagination/ListAppAssessmentsPaginator.ts         | 3 ++-
 .../pagination/ListAppComponentCompliancesPaginator.ts    | 3 ++-
 .../ListAppComponentRecommendationsPaginator.ts           | 3 ++-
 .../pagination/ListAppVersionResourceMappingsPaginator.ts | 3 ++-
 .../src/pagination/ListAppVersionResourcesPaginator.ts    | 3 ++-
 .../src/pagination/ListAppVersionsPaginator.ts            | 3 ++-
 .../src/pagination/ListAppsPaginator.ts                   | 3 ++-
 .../pagination/ListRecommendationTemplatesPaginator.ts    | 3 ++-
 .../src/pagination/ListResiliencyPoliciesPaginator.ts     | 3 ++-
 .../src/pagination/ListSopRecommendationsPaginator.ts     | 3 ++-
 .../ListSuggestedResiliencyPoliciesPaginator.ts           | 3 ++-
 .../src/pagination/ListTestRecommendationsPaginator.ts    | 3 ++-
 .../ListUnsupportedAppVersionResourcesPaginator.ts        | 3 ++-
 .../src/pagination/GetComplianceSummaryPaginator.ts       | 3 ++-
 .../src/pagination/GetResourcesPaginator.ts               | 3 ++-
 .../src/pagination/GetTagKeysPaginator.ts                 | 3 ++-
 .../src/pagination/GetTagValuesPaginator.ts               | 3 ++-
 .../src/pagination/ListGroupResourcesPaginator.ts         | 3 ++-
 .../src/pagination/ListGroupsPaginator.ts                 | 3 ++-
 .../src/pagination/SearchResourcesPaginator.ts            | 3 ++-
 .../src/pagination/ListDeploymentJobsPaginator.ts         | 3 ++-
 .../src/pagination/ListFleetsPaginator.ts                 | 3 ++-
 .../src/pagination/ListRobotApplicationsPaginator.ts      | 3 ++-
 .../src/pagination/ListRobotsPaginator.ts                 | 3 ++-
 .../src/pagination/ListSimulationApplicationsPaginator.ts | 3 ++-
 .../src/pagination/ListSimulationJobBatchesPaginator.ts   | 3 ++-
 .../src/pagination/ListSimulationJobsPaginator.ts         | 3 ++-
 .../src/pagination/ListWorldExportJobsPaginator.ts        | 3 ++-
 .../src/pagination/ListWorldGenerationJobsPaginator.ts    | 3 ++-
 .../src/pagination/ListWorldTemplatesPaginator.ts         | 3 ++-
 .../src/pagination/ListWorldsPaginator.ts                 | 3 ++-
 .../src/pagination/ListDomainsPaginator.ts                | 3 ++-
 .../src/pagination/ListOperationsPaginator.ts             | 3 ++-
 .../src/pagination/ListPricesPaginator.ts                 | 3 ++-
 .../src/pagination/ViewBillingPaginator.ts                | 3 ++-
 .../src/pagination/ListHealthChecksPaginator.ts           | 3 ++-
 .../src/pagination/ListHostedZonesPaginator.ts            | 3 ++-
 .../src/pagination/ListQueryLoggingConfigsPaginator.ts    | 3 ++-
 .../src/pagination/ListRoutingControlsPaginator.ts        | 3 ++-
 .../ListAssociatedRoute53HealthChecksPaginator.ts         | 3 ++-
 .../src/pagination/ListClustersPaginator.ts               | 3 ++-
 .../src/pagination/ListControlPanelsPaginator.ts          | 3 ++-
 .../src/pagination/ListRoutingControlsPaginator.ts        | 3 ++-
 .../src/pagination/ListSafetyRulesPaginator.ts            | 3 ++-
 .../src/pagination/GetCellReadinessSummaryPaginator.ts    | 3 ++-
 .../GetReadinessCheckResourceStatusPaginator.ts           | 3 ++-
 .../src/pagination/GetReadinessCheckStatusPaginator.ts    | 3 ++-
 .../GetRecoveryGroupReadinessSummaryPaginator.ts          | 3 ++-
 .../src/pagination/ListCellsPaginator.ts                  | 3 ++-
 .../pagination/ListCrossAccountAuthorizationsPaginator.ts | 3 ++-
 .../src/pagination/ListReadinessChecksPaginator.ts        | 3 ++-
 .../src/pagination/ListRecoveryGroupsPaginator.ts         | 3 ++-
 .../src/pagination/ListResourceSetsPaginator.ts           | 3 ++-
 .../src/pagination/ListRulesPaginator.ts                  | 3 ++-
 .../src/pagination/ListFirewallConfigsPaginator.ts        | 3 ++-
 .../src/pagination/ListFirewallDomainListsPaginator.ts    | 3 ++-
 .../src/pagination/ListFirewallDomainsPaginator.ts        | 3 ++-
 .../ListFirewallRuleGroupAssociationsPaginator.ts         | 3 ++-
 .../src/pagination/ListFirewallRuleGroupsPaginator.ts     | 3 ++-
 .../src/pagination/ListFirewallRulesPaginator.ts          | 3 ++-
 .../src/pagination/ListResolverConfigsPaginator.ts        | 3 ++-
 .../src/pagination/ListResolverDnssecConfigsPaginator.ts  | 3 ++-
 .../ListResolverEndpointIpAddressesPaginator.ts           | 3 ++-
 .../src/pagination/ListResolverEndpointsPaginator.ts      | 3 ++-
 .../ListResolverQueryLogConfigAssociationsPaginator.ts    | 3 ++-
 .../pagination/ListResolverQueryLogConfigsPaginator.ts    | 3 ++-
 .../pagination/ListResolverRuleAssociationsPaginator.ts   | 3 ++-
 .../src/pagination/ListResolverRulesPaginator.ts          | 3 ++-
 .../src/pagination/ListTagsForResourcePaginator.ts        | 3 ++-
 .../src/pagination/GetAppMonitorDataPaginator.ts          | 3 ++-
 .../client-rum/src/pagination/ListAppMonitorsPaginator.ts | 3 ++-
 .../ListAccessPointsForObjectLambdaPaginator.ts           | 3 ++-
 .../src/pagination/ListAccessPointsPaginator.ts           | 3 ++-
 .../client-s3-control/src/pagination/ListJobsPaginator.ts | 3 ++-
 .../pagination/ListMultiRegionAccessPointsPaginator.ts    | 3 ++-
 .../src/pagination/ListRegionalBucketsPaginator.ts        | 3 ++-
 .../pagination/ListStorageLensConfigurationsPaginator.ts  | 3 ++-
 .../client-s3/src/pagination/ListObjectsV2Paginator.ts    | 3 ++-
 clients/client-s3/src/pagination/ListPartsPaginator.ts    | 3 ++-
 .../src/pagination/ListEndpointsPaginator.ts              | 3 ++-
 .../src/pagination/ListSharedEndpointsPaginator.ts        | 3 ++-
 .../src/pagination/ListHumanLoopsPaginator.ts             | 3 ++-
 .../src/pagination/ListActionsPaginator.ts                | 3 ++-
 .../src/pagination/ListAlgorithmsPaginator.ts             | 3 ++-
 .../src/pagination/ListAppImageConfigsPaginator.ts        | 3 ++-
 .../client-sagemaker/src/pagination/ListAppsPaginator.ts  | 3 ++-
 .../src/pagination/ListArtifactsPaginator.ts              | 3 ++-
 .../src/pagination/ListAssociationsPaginator.ts           | 3 ++-
 .../src/pagination/ListAutoMLJobsPaginator.ts             | 3 ++-
 .../src/pagination/ListCandidatesForAutoMLJobPaginator.ts | 3 ++-
 .../src/pagination/ListCodeRepositoriesPaginator.ts       | 3 ++-
 .../src/pagination/ListCompilationJobsPaginator.ts        | 3 ++-
 .../src/pagination/ListContextsPaginator.ts               | 3 ++-
 .../pagination/ListDataQualityJobDefinitionsPaginator.ts  | 3 ++-
 .../src/pagination/ListDeviceFleetsPaginator.ts           | 3 ++-
 .../src/pagination/ListDevicesPaginator.ts                | 3 ++-
 .../src/pagination/ListDomainsPaginator.ts                | 3 ++-
 .../src/pagination/ListEdgePackagingJobsPaginator.ts      | 3 ++-
 .../src/pagination/ListEndpointConfigsPaginator.ts        | 3 ++-
 .../src/pagination/ListEndpointsPaginator.ts              | 3 ++-
 .../src/pagination/ListExperimentsPaginator.ts            | 3 ++-
 .../src/pagination/ListFlowDefinitionsPaginator.ts        | 3 ++-
 .../src/pagination/ListHumanTaskUisPaginator.ts           | 3 ++-
 .../pagination/ListHyperParameterTuningJobsPaginator.ts   | 3 ++-
 .../src/pagination/ListImageVersionsPaginator.ts          | 3 ++-
 .../src/pagination/ListImagesPaginator.ts                 | 3 ++-
 .../ListInferenceRecommendationsJobsPaginator.ts          | 3 ++-
 .../pagination/ListLabelingJobsForWorkteamPaginator.ts    | 3 ++-
 .../src/pagination/ListLabelingJobsPaginator.ts           | 3 ++-
 .../src/pagination/ListLineageGroupsPaginator.ts          | 3 ++-
 .../pagination/ListModelBiasJobDefinitionsPaginator.ts    | 3 ++-
 .../ListModelExplainabilityJobDefinitionsPaginator.ts     | 3 ++-
 .../src/pagination/ListModelMetadataPaginator.ts          | 3 ++-
 .../src/pagination/ListModelPackageGroupsPaginator.ts     | 3 ++-
 .../src/pagination/ListModelPackagesPaginator.ts          | 3 ++-
 .../pagination/ListModelQualityJobDefinitionsPaginator.ts | 3 ++-
 .../src/pagination/ListModelsPaginator.ts                 | 3 ++-
 .../src/pagination/ListMonitoringExecutionsPaginator.ts   | 3 ++-
 .../src/pagination/ListMonitoringSchedulesPaginator.ts    | 3 ++-
 .../ListNotebookInstanceLifecycleConfigsPaginator.ts      | 3 ++-
 .../src/pagination/ListNotebookInstancesPaginator.ts      | 3 ++-
 .../src/pagination/ListPipelineExecutionStepsPaginator.ts | 3 ++-
 .../src/pagination/ListPipelineExecutionsPaginator.ts     | 3 ++-
 .../ListPipelineParametersForExecutionPaginator.ts        | 3 ++-
 .../src/pagination/ListPipelinesPaginator.ts              | 3 ++-
 .../src/pagination/ListProcessingJobsPaginator.ts         | 3 ++-
 .../src/pagination/ListProjectsPaginator.ts               | 3 ++-
 .../src/pagination/ListStudioLifecycleConfigsPaginator.ts | 3 ++-
 .../src/pagination/ListSubscribedWorkteamsPaginator.ts    | 3 ++-
 .../client-sagemaker/src/pagination/ListTagsPaginator.ts  | 3 ++-
 ...ListTrainingJobsForHyperParameterTuningJobPaginator.ts | 3 ++-
 .../src/pagination/ListTrainingJobsPaginator.ts           | 3 ++-
 .../src/pagination/ListTransformJobsPaginator.ts          | 3 ++-
 .../src/pagination/ListTrialComponentsPaginator.ts        | 3 ++-
 .../src/pagination/ListTrialsPaginator.ts                 | 3 ++-
 .../src/pagination/ListUserProfilesPaginator.ts           | 3 ++-
 .../src/pagination/ListWorkforcesPaginator.ts             | 3 ++-
 .../src/pagination/ListWorkteamsPaginator.ts              | 3 ++-
 .../src/pagination/QueryLineagePaginator.ts               | 3 ++-
 .../client-sagemaker/src/pagination/SearchPaginator.ts    | 3 ++-
 .../src/pagination/ListDiscoverersPaginator.ts            | 3 ++-
 .../src/pagination/ListRegistriesPaginator.ts             | 3 ++-
 .../src/pagination/ListSchemaVersionsPaginator.ts         | 3 ++-
 .../client-schemas/src/pagination/ListSchemasPaginator.ts | 3 ++-
 .../src/pagination/SearchSchemasPaginator.ts              | 3 ++-
 .../src/pagination/ListSecretVersionIdsPaginator.ts       | 3 ++-
 .../src/pagination/ListSecretsPaginator.ts                | 3 ++-
 .../src/pagination/DescribeActionTargetsPaginator.ts      | 3 ++-
 .../src/pagination/DescribeProductsPaginator.ts           | 3 ++-
 .../src/pagination/DescribeStandardsControlsPaginator.ts  | 3 ++-
 .../src/pagination/DescribeStandardsPaginator.ts          | 3 ++-
 .../src/pagination/GetEnabledStandardsPaginator.ts        | 3 ++-
 .../src/pagination/GetFindingsPaginator.ts                | 3 ++-
 .../src/pagination/GetInsightsPaginator.ts                | 3 ++-
 .../pagination/ListEnabledProductsForImportPaginator.ts   | 3 ++-
 .../src/pagination/ListFindingAggregatorsPaginator.ts     | 3 ++-
 .../src/pagination/ListInvitationsPaginator.ts            | 3 ++-
 .../src/pagination/ListMembersPaginator.ts                | 3 ++-
 .../pagination/ListOrganizationAdminAccountsPaginator.ts  | 3 ++-
 .../pagination/ListApplicationDependenciesPaginator.ts    | 3 ++-
 .../src/pagination/ListApplicationVersionsPaginator.ts    | 3 ++-
 .../src/pagination/ListApplicationsPaginator.ts           | 3 ++-
 .../src/pagination/ListApplicationsPaginator.ts           | 3 ++-
 .../pagination/ListAssociatedAttributeGroupsPaginator.ts  | 3 ++-
 .../src/pagination/ListAssociatedResourcesPaginator.ts    | 3 ++-
 .../src/pagination/ListAttributeGroupsPaginator.ts        | 3 ++-
 .../src/pagination/DescribePortfolioSharesPaginator.ts    | 3 ++-
 .../pagination/GetProvisionedProductOutputsPaginator.ts   | 3 ++-
 .../pagination/ListAcceptedPortfolioSharesPaginator.ts    | 3 ++-
 .../src/pagination/ListBudgetsForResourcePaginator.ts     | 3 ++-
 .../pagination/ListConstraintsForPortfolioPaginator.ts    | 3 ++-
 .../src/pagination/ListLaunchPathsPaginator.ts            | 3 ++-
 .../ListOrganizationPortfolioAccessPaginator.ts           | 3 ++-
 .../src/pagination/ListPortfolioAccessPaginator.ts        | 3 ++-
 .../src/pagination/ListPortfoliosForProductPaginator.ts   | 3 ++-
 .../src/pagination/ListPortfoliosPaginator.ts             | 3 ++-
 .../src/pagination/ListPrincipalsForPortfolioPaginator.ts | 3 ++-
 .../ListProvisioningArtifactsForServiceActionPaginator.ts | 3 ++-
 .../src/pagination/ListResourcesForTagOptionPaginator.ts  | 3 ++-
 .../ListServiceActionsForProvisioningArtifactPaginator.ts | 3 ++-
 .../src/pagination/ListServiceActionsPaginator.ts         | 3 ++-
 .../src/pagination/ListTagOptionsPaginator.ts             | 3 ++-
 .../src/pagination/SearchProductsAsAdminPaginator.ts      | 3 ++-
 .../src/pagination/SearchProductsPaginator.ts             | 3 ++-
 .../src/pagination/SearchProvisionedProductsPaginator.ts  | 3 ++-
 .../pagination/ListAWSDefaultServiceQuotasPaginator.ts    | 3 ++-
 ...tRequestedServiceQuotaChangeHistoryByQuotaPaginator.ts | 3 ++-
 .../ListRequestedServiceQuotaChangeHistoryPaginator.ts    | 3 ++-
 ...ListServiceQuotaIncreaseRequestsInTemplatePaginator.ts | 3 ++-
 .../src/pagination/ListServiceQuotasPaginator.ts          | 3 ++-
 .../src/pagination/ListServicesPaginator.ts               | 3 ++-
 .../src/pagination/GetInstancesHealthStatusPaginator.ts   | 3 ++-
 .../src/pagination/ListInstancesPaginator.ts              | 3 ++-
 .../src/pagination/ListNamespacesPaginator.ts             | 3 ++-
 .../src/pagination/ListOperationsPaginator.ts             | 3 ++-
 .../src/pagination/ListServicesPaginator.ts               | 3 ++-
 .../ListCustomVerificationEmailTemplatesPaginator.ts      | 3 ++-
 .../client-ses/src/pagination/ListIdentitiesPaginator.ts  | 3 ++-
 .../src/pagination/GetDedicatedIpsPaginator.ts            | 3 ++-
 .../src/pagination/ListConfigurationSetsPaginator.ts      | 3 ++-
 .../src/pagination/ListContactListsPaginator.ts           | 3 ++-
 .../client-sesv2/src/pagination/ListContactsPaginator.ts  | 3 ++-
 .../ListCustomVerificationEmailTemplatesPaginator.ts      | 3 ++-
 .../src/pagination/ListDedicatedIpPoolsPaginator.ts       | 3 ++-
 .../pagination/ListDeliverabilityTestReportsPaginator.ts  | 3 ++-
 .../ListDomainDeliverabilityCampaignsPaginator.ts         | 3 ++-
 .../src/pagination/ListEmailIdentitiesPaginator.ts        | 3 ++-
 .../src/pagination/ListEmailTemplatesPaginator.ts         | 3 ++-
 .../src/pagination/ListImportJobsPaginator.ts             | 3 ++-
 .../src/pagination/ListSuppressedDestinationsPaginator.ts | 3 ++-
 .../src/pagination/GetExecutionHistoryPaginator.ts        | 3 ++-
 .../client-sfn/src/pagination/ListActivitiesPaginator.ts  | 3 ++-
 .../client-sfn/src/pagination/ListExecutionsPaginator.ts  | 3 ++-
 .../src/pagination/ListStateMachinesPaginator.ts          | 3 ++-
 .../client-shield/src/pagination/ListAttacksPaginator.ts  | 3 ++-
 .../src/pagination/ListProtectionGroupsPaginator.ts       | 3 ++-
 .../src/pagination/ListProtectionsPaginator.ts            | 3 ++-
 .../pagination/ListResourcesInProtectionGroupPaginator.ts | 3 ++-
 .../src/pagination/ListSigningJobsPaginator.ts            | 3 ++-
 .../src/pagination/ListSigningPlatformsPaginator.ts       | 3 ++-
 .../src/pagination/ListSigningProfilesPaginator.ts        | 3 ++-
 .../client-sms/src/pagination/GetConnectorsPaginator.ts   | 3 ++-
 .../src/pagination/GetReplicationJobsPaginator.ts         | 3 ++-
 .../src/pagination/GetReplicationRunsPaginator.ts         | 3 ++-
 clients/client-sms/src/pagination/GetServersPaginator.ts  | 3 ++-
 .../src/pagination/ListDeviceResourcesPaginator.ts        | 3 ++-
 .../src/pagination/ListDevicesPaginator.ts                | 3 ++-
 .../src/pagination/ListExecutionsPaginator.ts             | 3 ++-
 .../src/pagination/ListTasksPaginator.ts                  | 3 ++-
 .../src/pagination/DescribeAddressesPaginator.ts          | 3 ++-
 .../client-snowball/src/pagination/ListJobsPaginator.ts   | 3 ++-
 .../ListEndpointsByPlatformApplicationPaginator.ts        | 3 ++-
 .../src/pagination/ListOriginationNumbersPaginator.ts     | 3 ++-
 .../src/pagination/ListPhoneNumbersOptedOutPaginator.ts   | 3 ++-
 .../src/pagination/ListPlatformApplicationsPaginator.ts   | 3 ++-
 .../src/pagination/ListSMSSandboxPhoneNumbersPaginator.ts | 3 ++-
 .../src/pagination/ListSubscriptionsByTopicPaginator.ts   | 3 ++-
 .../src/pagination/ListSubscriptionsPaginator.ts          | 3 ++-
 clients/client-sns/src/pagination/ListTopicsPaginator.ts  | 3 ++-
 .../src/pagination/ListDeadLetterSourceQueuesPaginator.ts | 3 ++-
 clients/client-sqs/src/pagination/ListQueuesPaginator.ts  | 3 ++-
 .../src/pagination/ListContactChannelsPaginator.ts        | 3 ++-
 .../src/pagination/ListContactsPaginator.ts               | 3 ++-
 .../src/pagination/ListEngagementsPaginator.ts            | 3 ++-
 .../src/pagination/ListPageReceiptsPaginator.ts           | 3 ++-
 .../src/pagination/ListPagesByContactPaginator.ts         | 3 ++-
 .../src/pagination/ListPagesByEngagementPaginator.ts      | 3 ++-
 .../src/pagination/GetResourcePoliciesPaginator.ts        | 3 ++-
 .../src/pagination/ListIncidentRecordsPaginator.ts        | 3 ++-
 .../src/pagination/ListRelatedItemsPaginator.ts           | 3 ++-
 .../src/pagination/ListReplicationSetsPaginator.ts        | 3 ++-
 .../src/pagination/ListResponsePlansPaginator.ts          | 3 ++-
 .../src/pagination/ListTimelineEventsPaginator.ts         | 3 ++-
 .../src/pagination/DescribeActivationsPaginator.ts        | 3 ++-
 .../DescribeAssociationExecutionTargetsPaginator.ts       | 3 ++-
 .../pagination/DescribeAssociationExecutionsPaginator.ts  | 3 ++-
 .../pagination/DescribeAutomationExecutionsPaginator.ts   | 3 ++-
 .../DescribeAutomationStepExecutionsPaginator.ts          | 3 ++-
 .../src/pagination/DescribeAvailablePatchesPaginator.ts   | 3 ++-
 .../DescribeEffectiveInstanceAssociationsPaginator.ts     | 3 ++-
 .../DescribeEffectivePatchesForPatchBaselinePaginator.ts  | 3 ++-
 .../DescribeInstanceAssociationsStatusPaginator.ts        | 3 ++-
 .../pagination/DescribeInstanceInformationPaginator.ts    | 3 ++-
 .../DescribeInstancePatchStatesForPatchGroupPaginator.ts  | 3 ++-
 .../pagination/DescribeInstancePatchStatesPaginator.ts    | 3 ++-
 .../src/pagination/DescribeInstancePatchesPaginator.ts    | 3 ++-
 .../src/pagination/DescribeInventoryDeletionsPaginator.ts | 3 ++-
 ...eMaintenanceWindowExecutionTaskInvocationsPaginator.ts | 3 ++-
 .../DescribeMaintenanceWindowExecutionTasksPaginator.ts   | 3 ++-
 .../DescribeMaintenanceWindowExecutionsPaginator.ts       | 3 ++-
 .../DescribeMaintenanceWindowSchedulePaginator.ts         | 3 ++-
 .../DescribeMaintenanceWindowTargetsPaginator.ts          | 3 ++-
 .../pagination/DescribeMaintenanceWindowTasksPaginator.ts | 3 ++-
 .../DescribeMaintenanceWindowsForTargetPaginator.ts       | 3 ++-
 .../src/pagination/DescribeMaintenanceWindowsPaginator.ts | 3 ++-
 .../src/pagination/DescribeOpsItemsPaginator.ts           | 3 ++-
 .../src/pagination/DescribeParametersPaginator.ts         | 3 ++-
 .../src/pagination/DescribePatchBaselinesPaginator.ts     | 3 ++-
 .../src/pagination/DescribePatchGroupsPaginator.ts        | 3 ++-
 .../src/pagination/DescribePatchPropertiesPaginator.ts    | 3 ++-
 .../src/pagination/DescribeSessionsPaginator.ts           | 3 ++-
 .../client-ssm/src/pagination/GetInventoryPaginator.ts    | 3 ++-
 .../src/pagination/GetInventorySchemaPaginator.ts         | 3 ++-
 .../client-ssm/src/pagination/GetOpsSummaryPaginator.ts   | 3 ++-
 .../src/pagination/GetParameterHistoryPaginator.ts        | 3 ++-
 .../src/pagination/GetParametersByPathPaginator.ts        | 3 ++-
 .../src/pagination/ListAssociationVersionsPaginator.ts    | 3 ++-
 .../src/pagination/ListAssociationsPaginator.ts           | 3 ++-
 .../src/pagination/ListCommandInvocationsPaginator.ts     | 3 ++-
 .../client-ssm/src/pagination/ListCommandsPaginator.ts    | 3 ++-
 .../src/pagination/ListComplianceItemsPaginator.ts        | 3 ++-
 .../src/pagination/ListComplianceSummariesPaginator.ts    | 3 ++-
 .../src/pagination/ListDocumentVersionsPaginator.ts       | 3 ++-
 .../client-ssm/src/pagination/ListDocumentsPaginator.ts   | 3 ++-
 .../src/pagination/ListOpsItemEventsPaginator.ts          | 3 ++-
 .../src/pagination/ListOpsItemRelatedItemsPaginator.ts    | 3 ++-
 .../client-ssm/src/pagination/ListOpsMetadataPaginator.ts | 3 ++-
 .../ListResourceComplianceSummariesPaginator.ts           | 3 ++-
 .../src/pagination/ListResourceDataSyncPaginator.ts       | 3 ++-
 .../ListAccountAssignmentCreationStatusPaginator.ts       | 3 ++-
 .../ListAccountAssignmentDeletionStatusPaginator.ts       | 3 ++-
 .../src/pagination/ListAccountAssignmentsPaginator.ts     | 3 ++-
 .../ListAccountsForProvisionedPermissionSetPaginator.ts   | 3 ++-
 .../src/pagination/ListInstancesPaginator.ts              | 3 ++-
 .../ListManagedPoliciesInPermissionSetPaginator.ts        | 3 ++-
 .../ListPermissionSetProvisioningStatusPaginator.ts       | 3 ++-
 .../src/pagination/ListPermissionSetsPaginator.ts         | 3 ++-
 .../ListPermissionSetsProvisionedToAccountPaginator.ts    | 3 ++-
 .../src/pagination/ListTagsForResourcePaginator.ts        | 3 ++-
 .../src/pagination/ListAccountRolesPaginator.ts           | 3 ++-
 .../client-sso/src/pagination/ListAccountsPaginator.ts    | 3 ++-
 .../src/pagination/DescribeTapeArchivesPaginator.ts       | 3 ++-
 .../src/pagination/DescribeTapeRecoveryPointsPaginator.ts | 3 ++-
 .../src/pagination/DescribeTapesPaginator.ts              | 3 ++-
 .../src/pagination/DescribeVTLDevicesPaginator.ts         | 3 ++-
 .../src/pagination/ListFileSharesPaginator.ts             | 3 ++-
 .../src/pagination/ListFileSystemAssociationsPaginator.ts | 3 ++-
 .../src/pagination/ListGatewaysPaginator.ts               | 3 ++-
 .../src/pagination/ListTagsForResourcePaginator.ts        | 3 ++-
 .../src/pagination/ListTapePoolsPaginator.ts              | 3 ++-
 .../src/pagination/ListTapesPaginator.ts                  | 3 ++-
 .../src/pagination/ListVolumesPaginator.ts                | 3 ++-
 .../src/pagination/DescribeCasesPaginator.ts              | 3 ++-
 .../src/pagination/DescribeCommunicationsPaginator.ts     | 3 ++-
 .../pagination/GetWorkflowExecutionHistoryPaginator.ts    | 3 ++-
 .../src/pagination/ListActivityTypesPaginator.ts          | 3 ++-
 .../pagination/ListClosedWorkflowExecutionsPaginator.ts   | 3 ++-
 clients/client-swf/src/pagination/ListDomainsPaginator.ts | 3 ++-
 .../src/pagination/ListOpenWorkflowExecutionsPaginator.ts | 3 ++-
 .../src/pagination/ListWorkflowTypesPaginator.ts          | 3 ++-
 .../src/pagination/PollForDecisionTaskPaginator.ts        | 3 ++-
 .../src/pagination/DescribeCanariesLastRunPaginator.ts    | 3 ++-
 .../src/pagination/DescribeCanariesPaginator.ts           | 3 ++-
 .../src/pagination/DescribeRuntimeVersionsPaginator.ts    | 3 ++-
 .../src/pagination/GetCanaryRunsPaginator.ts              | 3 ++-
 .../src/pagination/ListScheduledQueriesPaginator.ts       | 3 ++-
 .../src/pagination/ListTagsForResourcePaginator.ts        | 3 ++-
 .../src/pagination/QueryPaginator.ts                      | 3 ++-
 .../src/pagination/ListDatabasesPaginator.ts              | 3 ++-
 .../src/pagination/ListTablesPaginator.ts                 | 3 ++-
 .../pagination/ListCallAnalyticsCategoriesPaginator.ts    | 3 ++-
 .../src/pagination/ListCallAnalyticsJobsPaginator.ts      | 3 ++-
 .../src/pagination/ListLanguageModelsPaginator.ts         | 3 ++-
 .../pagination/ListMedicalTranscriptionJobsPaginator.ts   | 3 ++-
 .../src/pagination/ListMedicalVocabulariesPaginator.ts    | 3 ++-
 .../src/pagination/ListTranscriptionJobsPaginator.ts      | 3 ++-
 .../src/pagination/ListVocabulariesPaginator.ts           | 3 ++-
 .../src/pagination/ListVocabularyFiltersPaginator.ts      | 3 ++-
 .../src/pagination/ListAccessesPaginator.ts               | 3 ++-
 .../src/pagination/ListExecutionsPaginator.ts             | 3 ++-
 .../src/pagination/ListSecurityPoliciesPaginator.ts       | 3 ++-
 .../src/pagination/ListServersPaginator.ts                | 3 ++-
 .../src/pagination/ListTagsForResourcePaginator.ts        | 3 ++-
 .../client-transfer/src/pagination/ListUsersPaginator.ts  | 3 ++-
 .../src/pagination/ListWorkflowsPaginator.ts              | 3 ++-
 .../src/pagination/ListParallelDataPaginator.ts           | 3 ++-
 .../src/pagination/ListTerminologiesPaginator.ts          | 3 ++-
 .../src/pagination/ListTextTranslationJobsPaginator.ts    | 3 ++-
 .../src/pagination/ListDomainsPaginator.ts                | 3 ++-
 .../pagination/ListFraudsterRegistrationJobsPaginator.ts  | 3 ++-
 .../src/pagination/ListSpeakerEnrollmentJobsPaginator.ts  | 3 ++-
 .../src/pagination/ListSpeakersPaginator.ts               | 3 ++-
 .../src/pagination/ListAnswersPaginator.ts                | 3 ++-
 .../src/pagination/ListLensReviewImprovementsPaginator.ts | 3 ++-
 .../src/pagination/ListLensReviewsPaginator.ts            | 3 ++-
 .../src/pagination/ListLensSharesPaginator.ts             | 3 ++-
 .../src/pagination/ListLensesPaginator.ts                 | 3 ++-
 .../src/pagination/ListMilestonesPaginator.ts             | 3 ++-
 .../src/pagination/ListNotificationsPaginator.ts          | 3 ++-
 .../src/pagination/ListShareInvitationsPaginator.ts       | 3 ++-
 .../src/pagination/ListWorkloadSharesPaginator.ts         | 3 ++-
 .../src/pagination/ListWorkloadsPaginator.ts              | 3 ++-
 .../src/pagination/ListAssistantAssociationsPaginator.ts  | 3 ++-
 .../src/pagination/ListAssistantsPaginator.ts             | 3 ++-
 .../client-wisdom/src/pagination/ListContentsPaginator.ts | 3 ++-
 .../src/pagination/ListKnowledgeBasesPaginator.ts         | 3 ++-
 .../src/pagination/QueryAssistantPaginator.ts             | 3 ++-
 .../src/pagination/SearchContentPaginator.ts              | 3 ++-
 .../src/pagination/SearchSessionsPaginator.ts             | 3 ++-
 .../src/pagination/DescribeDocumentVersionsPaginator.ts   | 3 ++-
 .../src/pagination/DescribeFolderContentsPaginator.ts     | 3 ++-
 .../src/pagination/DescribeUsersPaginator.ts              | 3 ++-
 .../src/pagination/ListDevicesPaginator.ts                | 3 ++-
 .../src/pagination/ListDomainsPaginator.ts                | 3 ++-
 .../client-worklink/src/pagination/ListFleetsPaginator.ts | 3 ++-
 .../ListWebsiteAuthorizationProvidersPaginator.ts         | 3 ++-
 .../ListWebsiteCertificateAuthoritiesPaginator.ts         | 3 ++-
 .../src/pagination/ListAliasesPaginator.ts                | 3 ++-
 .../src/pagination/ListGroupMembersPaginator.ts           | 3 ++-
 .../client-workmail/src/pagination/ListGroupsPaginator.ts | 3 ++-
 .../src/pagination/ListMailDomainsPaginator.ts            | 3 ++-
 .../src/pagination/ListMailboxExportJobsPaginator.ts      | 3 ++-
 .../src/pagination/ListMailboxPermissionsPaginator.ts     | 3 ++-
 .../ListMobileDeviceAccessOverridesPaginator.ts           | 3 ++-
 .../src/pagination/ListOrganizationsPaginator.ts          | 3 ++-
 .../src/pagination/ListResourceDelegatesPaginator.ts      | 3 ++-
 .../src/pagination/ListResourcesPaginator.ts              | 3 ++-
 .../client-workmail/src/pagination/ListUsersPaginator.ts  | 3 ++-
 .../src/pagination/ListBrowserSettingsPaginator.ts        | 3 ++-
 .../src/pagination/ListIdentityProvidersPaginator.ts      | 3 ++-
 .../src/pagination/ListNetworkSettingsPaginator.ts        | 3 ++-
 .../src/pagination/ListPortalsPaginator.ts                | 3 ++-
 .../src/pagination/ListTrustStoreCertificatesPaginator.ts | 3 ++-
 .../src/pagination/ListTrustStoresPaginator.ts            | 3 ++-
 .../src/pagination/ListUserSettingsPaginator.ts           | 3 ++-
 .../src/pagination/DescribeWorkspaceBundlesPaginator.ts   | 3 ++-
 .../pagination/DescribeWorkspaceDirectoriesPaginator.ts   | 3 ++-
 .../src/pagination/DescribeWorkspacesPaginator.ts         | 3 ++-
 .../client-xray/src/pagination/BatchGetTracesPaginator.ts | 3 ++-
 clients/client-xray/src/pagination/GetGroupsPaginator.ts  | 3 ++-
 .../src/pagination/GetInsightEventsPaginator.ts           | 3 ++-
 .../src/pagination/GetInsightSummariesPaginator.ts        | 3 ++-
 .../src/pagination/GetSamplingRulesPaginator.ts           | 3 ++-
 .../pagination/GetSamplingStatisticSummariesPaginator.ts  | 3 ++-
 .../src/pagination/GetServiceGraphPaginator.ts            | 3 ++-
 .../pagination/GetTimeSeriesServiceStatisticsPaginator.ts | 3 ++-
 .../client-xray/src/pagination/GetTraceGraphPaginator.ts  | 3 ++-
 .../src/pagination/GetTraceSummariesPaginator.ts          | 3 ++-
 packages/types/src/pagination.ts                          | 8 ++++++++
 1938 files changed, 3882 insertions(+), 1937 deletions(-)

diff --git a/clients/client-accessanalyzer/src/pagination/ListAccessPreviewFindingsPaginator.ts b/clients/client-accessanalyzer/src/pagination/ListAccessPreviewFindingsPaginator.ts
index 6af6de24c722..6963f58040aa 100644
--- a/clients/client-accessanalyzer/src/pagination/ListAccessPreviewFindingsPaginator.ts
+++ b/clients/client-accessanalyzer/src/pagination/ListAccessPreviewFindingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAccessPreviewFindings(
       throw new Error("Invalid client, expected AccessAnalyzer | AccessAnalyzerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-accessanalyzer/src/pagination/ListAccessPreviewsPaginator.ts b/clients/client-accessanalyzer/src/pagination/ListAccessPreviewsPaginator.ts
index 2d4a5a5a319b..23deb6cdb018 100644
--- a/clients/client-accessanalyzer/src/pagination/ListAccessPreviewsPaginator.ts
+++ b/clients/client-accessanalyzer/src/pagination/ListAccessPreviewsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAccessPreviews(
       throw new Error("Invalid client, expected AccessAnalyzer | AccessAnalyzerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-accessanalyzer/src/pagination/ListAnalyzedResourcesPaginator.ts b/clients/client-accessanalyzer/src/pagination/ListAnalyzedResourcesPaginator.ts
index 4912719faad3..abbdac1c342f 100644
--- a/clients/client-accessanalyzer/src/pagination/ListAnalyzedResourcesPaginator.ts
+++ b/clients/client-accessanalyzer/src/pagination/ListAnalyzedResourcesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAnalyzedResources(
       throw new Error("Invalid client, expected AccessAnalyzer | AccessAnalyzerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-accessanalyzer/src/pagination/ListAnalyzersPaginator.ts b/clients/client-accessanalyzer/src/pagination/ListAnalyzersPaginator.ts
index 8dab6a15fbce..bddaf9123020 100644
--- a/clients/client-accessanalyzer/src/pagination/ListAnalyzersPaginator.ts
+++ b/clients/client-accessanalyzer/src/pagination/ListAnalyzersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAnalyzers(
       throw new Error("Invalid client, expected AccessAnalyzer | AccessAnalyzerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-accessanalyzer/src/pagination/ListArchiveRulesPaginator.ts b/clients/client-accessanalyzer/src/pagination/ListArchiveRulesPaginator.ts
index af94398f7c98..dc489f89a847 100644
--- a/clients/client-accessanalyzer/src/pagination/ListArchiveRulesPaginator.ts
+++ b/clients/client-accessanalyzer/src/pagination/ListArchiveRulesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListArchiveRules(
       throw new Error("Invalid client, expected AccessAnalyzer | AccessAnalyzerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-accessanalyzer/src/pagination/ListFindingsPaginator.ts b/clients/client-accessanalyzer/src/pagination/ListFindingsPaginator.ts
index e018e1535ce3..dbac086708b6 100644
--- a/clients/client-accessanalyzer/src/pagination/ListFindingsPaginator.ts
+++ b/clients/client-accessanalyzer/src/pagination/ListFindingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFindings(
       throw new Error("Invalid client, expected AccessAnalyzer | AccessAnalyzerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-accessanalyzer/src/pagination/ListPolicyGenerationsPaginator.ts b/clients/client-accessanalyzer/src/pagination/ListPolicyGenerationsPaginator.ts
index 6a6de774d364..1f3fb6907cba 100644
--- a/clients/client-accessanalyzer/src/pagination/ListPolicyGenerationsPaginator.ts
+++ b/clients/client-accessanalyzer/src/pagination/ListPolicyGenerationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPolicyGenerations(
       throw new Error("Invalid client, expected AccessAnalyzer | AccessAnalyzerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-accessanalyzer/src/pagination/ValidatePolicyPaginator.ts b/clients/client-accessanalyzer/src/pagination/ValidatePolicyPaginator.ts
index cb5fc1cb1fee..dc72490007df 100644
--- a/clients/client-accessanalyzer/src/pagination/ValidatePolicyPaginator.ts
+++ b/clients/client-accessanalyzer/src/pagination/ValidatePolicyPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateValidatePolicy(
       throw new Error("Invalid client, expected AccessAnalyzer | AccessAnalyzerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-acm-pca/src/pagination/ListCertificateAuthoritiesPaginator.ts b/clients/client-acm-pca/src/pagination/ListCertificateAuthoritiesPaginator.ts
index b417c7b91ca5..6640b868acef 100644
--- a/clients/client-acm-pca/src/pagination/ListCertificateAuthoritiesPaginator.ts
+++ b/clients/client-acm-pca/src/pagination/ListCertificateAuthoritiesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCertificateAuthorities(
       throw new Error("Invalid client, expected ACMPCA | ACMPCAClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-acm-pca/src/pagination/ListPermissionsPaginator.ts b/clients/client-acm-pca/src/pagination/ListPermissionsPaginator.ts
index e2f5fb9550b9..0646dc026f9f 100644
--- a/clients/client-acm-pca/src/pagination/ListPermissionsPaginator.ts
+++ b/clients/client-acm-pca/src/pagination/ListPermissionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPermissions(
       throw new Error("Invalid client, expected ACMPCA | ACMPCAClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-acm-pca/src/pagination/ListTagsPaginator.ts b/clients/client-acm-pca/src/pagination/ListTagsPaginator.ts
index 8fde56c1501d..c27bfc3d67ef 100644
--- a/clients/client-acm-pca/src/pagination/ListTagsPaginator.ts
+++ b/clients/client-acm-pca/src/pagination/ListTagsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListTags(
       throw new Error("Invalid client, expected ACMPCA | ACMPCAClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-acm/src/pagination/ListCertificatesPaginator.ts b/clients/client-acm/src/pagination/ListCertificatesPaginator.ts
index f539c4a4295c..fc9abc0634ac 100644
--- a/clients/client-acm/src/pagination/ListCertificatesPaginator.ts
+++ b/clients/client-acm/src/pagination/ListCertificatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCertificates(
       throw new Error("Invalid client, expected ACM | ACMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-alexa-for-business/src/pagination/ListBusinessReportSchedulesPaginator.ts b/clients/client-alexa-for-business/src/pagination/ListBusinessReportSchedulesPaginator.ts
index 8ae5092b883d..858516137512 100644
--- a/clients/client-alexa-for-business/src/pagination/ListBusinessReportSchedulesPaginator.ts
+++ b/clients/client-alexa-for-business/src/pagination/ListBusinessReportSchedulesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListBusinessReportSchedules(
       throw new Error("Invalid client, expected AlexaForBusiness | AlexaForBusinessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-alexa-for-business/src/pagination/ListConferenceProvidersPaginator.ts b/clients/client-alexa-for-business/src/pagination/ListConferenceProvidersPaginator.ts
index b794a9689a3d..523f18a16e19 100644
--- a/clients/client-alexa-for-business/src/pagination/ListConferenceProvidersPaginator.ts
+++ b/clients/client-alexa-for-business/src/pagination/ListConferenceProvidersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListConferenceProviders(
       throw new Error("Invalid client, expected AlexaForBusiness | AlexaForBusinessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-alexa-for-business/src/pagination/ListDeviceEventsPaginator.ts b/clients/client-alexa-for-business/src/pagination/ListDeviceEventsPaginator.ts
index d3edda555b40..ac9ccc1534ea 100644
--- a/clients/client-alexa-for-business/src/pagination/ListDeviceEventsPaginator.ts
+++ b/clients/client-alexa-for-business/src/pagination/ListDeviceEventsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDeviceEvents(
       throw new Error("Invalid client, expected AlexaForBusiness | AlexaForBusinessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-alexa-for-business/src/pagination/ListGatewayGroupsPaginator.ts b/clients/client-alexa-for-business/src/pagination/ListGatewayGroupsPaginator.ts
index b1c47d558e3b..32327d9eaea3 100644
--- a/clients/client-alexa-for-business/src/pagination/ListGatewayGroupsPaginator.ts
+++ b/clients/client-alexa-for-business/src/pagination/ListGatewayGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListGatewayGroups(
       throw new Error("Invalid client, expected AlexaForBusiness | AlexaForBusinessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-alexa-for-business/src/pagination/ListGatewaysPaginator.ts b/clients/client-alexa-for-business/src/pagination/ListGatewaysPaginator.ts
index c64f98340cf8..6c96f14c8305 100644
--- a/clients/client-alexa-for-business/src/pagination/ListGatewaysPaginator.ts
+++ b/clients/client-alexa-for-business/src/pagination/ListGatewaysPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListGateways(
       throw new Error("Invalid client, expected AlexaForBusiness | AlexaForBusinessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-alexa-for-business/src/pagination/ListSkillsPaginator.ts b/clients/client-alexa-for-business/src/pagination/ListSkillsPaginator.ts
index 8f963429aa0e..63e8049a9972 100644
--- a/clients/client-alexa-for-business/src/pagination/ListSkillsPaginator.ts
+++ b/clients/client-alexa-for-business/src/pagination/ListSkillsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListSkills(
       throw new Error("Invalid client, expected AlexaForBusiness | AlexaForBusinessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-alexa-for-business/src/pagination/ListSkillsStoreCategoriesPaginator.ts b/clients/client-alexa-for-business/src/pagination/ListSkillsStoreCategoriesPaginator.ts
index 1f7d309ab99c..2e8881dbb13f 100644
--- a/clients/client-alexa-for-business/src/pagination/ListSkillsStoreCategoriesPaginator.ts
+++ b/clients/client-alexa-for-business/src/pagination/ListSkillsStoreCategoriesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSkillsStoreCategories(
       throw new Error("Invalid client, expected AlexaForBusiness | AlexaForBusinessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-alexa-for-business/src/pagination/ListSkillsStoreSkillsByCategoryPaginator.ts b/clients/client-alexa-for-business/src/pagination/ListSkillsStoreSkillsByCategoryPaginator.ts
index 0f6d5a4e49b1..71376b3b349c 100644
--- a/clients/client-alexa-for-business/src/pagination/ListSkillsStoreSkillsByCategoryPaginator.ts
+++ b/clients/client-alexa-for-business/src/pagination/ListSkillsStoreSkillsByCategoryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSkillsStoreSkillsByCategory(
       throw new Error("Invalid client, expected AlexaForBusiness | AlexaForBusinessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-alexa-for-business/src/pagination/ListSmartHomeAppliancesPaginator.ts b/clients/client-alexa-for-business/src/pagination/ListSmartHomeAppliancesPaginator.ts
index 5d5f9f369adf..00ff24939e66 100644
--- a/clients/client-alexa-for-business/src/pagination/ListSmartHomeAppliancesPaginator.ts
+++ b/clients/client-alexa-for-business/src/pagination/ListSmartHomeAppliancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSmartHomeAppliances(
       throw new Error("Invalid client, expected AlexaForBusiness | AlexaForBusinessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-alexa-for-business/src/pagination/ListTagsPaginator.ts b/clients/client-alexa-for-business/src/pagination/ListTagsPaginator.ts
index c699fbc1676a..a56f5fa71ce4 100644
--- a/clients/client-alexa-for-business/src/pagination/ListTagsPaginator.ts
+++ b/clients/client-alexa-for-business/src/pagination/ListTagsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListTags(
       throw new Error("Invalid client, expected AlexaForBusiness | AlexaForBusinessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-alexa-for-business/src/pagination/SearchAddressBooksPaginator.ts b/clients/client-alexa-for-business/src/pagination/SearchAddressBooksPaginator.ts
index e39cb85fa0c0..7ec0611320b7 100644
--- a/clients/client-alexa-for-business/src/pagination/SearchAddressBooksPaginator.ts
+++ b/clients/client-alexa-for-business/src/pagination/SearchAddressBooksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchAddressBooks(
       throw new Error("Invalid client, expected AlexaForBusiness | AlexaForBusinessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-alexa-for-business/src/pagination/SearchContactsPaginator.ts b/clients/client-alexa-for-business/src/pagination/SearchContactsPaginator.ts
index 6d5ac47536c3..87f9134c498c 100644
--- a/clients/client-alexa-for-business/src/pagination/SearchContactsPaginator.ts
+++ b/clients/client-alexa-for-business/src/pagination/SearchContactsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchContacts(
       throw new Error("Invalid client, expected AlexaForBusiness | AlexaForBusinessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-alexa-for-business/src/pagination/SearchDevicesPaginator.ts b/clients/client-alexa-for-business/src/pagination/SearchDevicesPaginator.ts
index 84c55699e60a..4d476e99ed33 100644
--- a/clients/client-alexa-for-business/src/pagination/SearchDevicesPaginator.ts
+++ b/clients/client-alexa-for-business/src/pagination/SearchDevicesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchDevices(
       throw new Error("Invalid client, expected AlexaForBusiness | AlexaForBusinessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-alexa-for-business/src/pagination/SearchNetworkProfilesPaginator.ts b/clients/client-alexa-for-business/src/pagination/SearchNetworkProfilesPaginator.ts
index 964e5d33c537..d5f62d3c15ec 100644
--- a/clients/client-alexa-for-business/src/pagination/SearchNetworkProfilesPaginator.ts
+++ b/clients/client-alexa-for-business/src/pagination/SearchNetworkProfilesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchNetworkProfiles(
       throw new Error("Invalid client, expected AlexaForBusiness | AlexaForBusinessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-alexa-for-business/src/pagination/SearchProfilesPaginator.ts b/clients/client-alexa-for-business/src/pagination/SearchProfilesPaginator.ts
index 83854d8f5ecf..25352850a05a 100644
--- a/clients/client-alexa-for-business/src/pagination/SearchProfilesPaginator.ts
+++ b/clients/client-alexa-for-business/src/pagination/SearchProfilesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchProfiles(
       throw new Error("Invalid client, expected AlexaForBusiness | AlexaForBusinessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-alexa-for-business/src/pagination/SearchRoomsPaginator.ts b/clients/client-alexa-for-business/src/pagination/SearchRoomsPaginator.ts
index 0fe56d839143..3d5f748c624f 100644
--- a/clients/client-alexa-for-business/src/pagination/SearchRoomsPaginator.ts
+++ b/clients/client-alexa-for-business/src/pagination/SearchRoomsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateSearchRooms(
       throw new Error("Invalid client, expected AlexaForBusiness | AlexaForBusinessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-alexa-for-business/src/pagination/SearchSkillGroupsPaginator.ts b/clients/client-alexa-for-business/src/pagination/SearchSkillGroupsPaginator.ts
index bab6672302ae..5663f9ce93bb 100644
--- a/clients/client-alexa-for-business/src/pagination/SearchSkillGroupsPaginator.ts
+++ b/clients/client-alexa-for-business/src/pagination/SearchSkillGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchSkillGroups(
       throw new Error("Invalid client, expected AlexaForBusiness | AlexaForBusinessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-alexa-for-business/src/pagination/SearchUsersPaginator.ts b/clients/client-alexa-for-business/src/pagination/SearchUsersPaginator.ts
index 86e50e9c0c89..5fc5d4e130ba 100644
--- a/clients/client-alexa-for-business/src/pagination/SearchUsersPaginator.ts
+++ b/clients/client-alexa-for-business/src/pagination/SearchUsersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateSearchUsers(
       throw new Error("Invalid client, expected AlexaForBusiness | AlexaForBusinessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-amp/src/pagination/ListRuleGroupsNamespacesPaginator.ts b/clients/client-amp/src/pagination/ListRuleGroupsNamespacesPaginator.ts
index d5da48da1372..1eba3dce8a72 100644
--- a/clients/client-amp/src/pagination/ListRuleGroupsNamespacesPaginator.ts
+++ b/clients/client-amp/src/pagination/ListRuleGroupsNamespacesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRuleGroupsNamespaces(
       throw new Error("Invalid client, expected Amp | AmpClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-amp/src/pagination/ListWorkspacesPaginator.ts b/clients/client-amp/src/pagination/ListWorkspacesPaginator.ts
index c153ec807a7c..99d79e47d9a3 100644
--- a/clients/client-amp/src/pagination/ListWorkspacesPaginator.ts
+++ b/clients/client-amp/src/pagination/ListWorkspacesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListWorkspaces(
       throw new Error("Invalid client, expected Amp | AmpClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-amplifyuibuilder/src/pagination/ExportComponentsPaginator.ts b/clients/client-amplifyuibuilder/src/pagination/ExportComponentsPaginator.ts
index e7186e0d130b..a90b7a097fbe 100644
--- a/clients/client-amplifyuibuilder/src/pagination/ExportComponentsPaginator.ts
+++ b/clients/client-amplifyuibuilder/src/pagination/ExportComponentsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateExportComponents(
       throw new Error("Invalid client, expected AmplifyUIBuilder | AmplifyUIBuilderClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-amplifyuibuilder/src/pagination/ExportThemesPaginator.ts b/clients/client-amplifyuibuilder/src/pagination/ExportThemesPaginator.ts
index 4a3092803752..df09d8d9ef90 100644
--- a/clients/client-amplifyuibuilder/src/pagination/ExportThemesPaginator.ts
+++ b/clients/client-amplifyuibuilder/src/pagination/ExportThemesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateExportThemes(
       throw new Error("Invalid client, expected AmplifyUIBuilder | AmplifyUIBuilderClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-amplifyuibuilder/src/pagination/ListComponentsPaginator.ts b/clients/client-amplifyuibuilder/src/pagination/ListComponentsPaginator.ts
index 2703e44e2007..ce25c97bf3b2 100644
--- a/clients/client-amplifyuibuilder/src/pagination/ListComponentsPaginator.ts
+++ b/clients/client-amplifyuibuilder/src/pagination/ListComponentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListComponents(
       throw new Error("Invalid client, expected AmplifyUIBuilder | AmplifyUIBuilderClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-amplifyuibuilder/src/pagination/ListThemesPaginator.ts b/clients/client-amplifyuibuilder/src/pagination/ListThemesPaginator.ts
index fcf5f159e017..a9d88c12a6ad 100644
--- a/clients/client-amplifyuibuilder/src/pagination/ListThemesPaginator.ts
+++ b/clients/client-amplifyuibuilder/src/pagination/ListThemesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListThemes(
       throw new Error("Invalid client, expected AmplifyUIBuilder | AmplifyUIBuilderClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-api-gateway/src/pagination/GetApiKeysPaginator.ts b/clients/client-api-gateway/src/pagination/GetApiKeysPaginator.ts
index c9d4c5cff537..3ff455558575 100644
--- a/clients/client-api-gateway/src/pagination/GetApiKeysPaginator.ts
+++ b/clients/client-api-gateway/src/pagination/GetApiKeysPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateGetApiKeys(
       throw new Error("Invalid client, expected APIGateway | APIGatewayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.position;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-api-gateway/src/pagination/GetBasePathMappingsPaginator.ts b/clients/client-api-gateway/src/pagination/GetBasePathMappingsPaginator.ts
index 86855c527948..507a11b3f73b 100644
--- a/clients/client-api-gateway/src/pagination/GetBasePathMappingsPaginator.ts
+++ b/clients/client-api-gateway/src/pagination/GetBasePathMappingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetBasePathMappings(
       throw new Error("Invalid client, expected APIGateway | APIGatewayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.position;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-api-gateway/src/pagination/GetClientCertificatesPaginator.ts b/clients/client-api-gateway/src/pagination/GetClientCertificatesPaginator.ts
index 7dc43c51c77b..c9dfe5516d12 100644
--- a/clients/client-api-gateway/src/pagination/GetClientCertificatesPaginator.ts
+++ b/clients/client-api-gateway/src/pagination/GetClientCertificatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetClientCertificates(
       throw new Error("Invalid client, expected APIGateway | APIGatewayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.position;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-api-gateway/src/pagination/GetDeploymentsPaginator.ts b/clients/client-api-gateway/src/pagination/GetDeploymentsPaginator.ts
index c3e09e533737..8050aecb0242 100644
--- a/clients/client-api-gateway/src/pagination/GetDeploymentsPaginator.ts
+++ b/clients/client-api-gateway/src/pagination/GetDeploymentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetDeployments(
       throw new Error("Invalid client, expected APIGateway | APIGatewayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.position;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-api-gateway/src/pagination/GetDomainNamesPaginator.ts b/clients/client-api-gateway/src/pagination/GetDomainNamesPaginator.ts
index 8d4bec6ee569..74767bcea9fc 100644
--- a/clients/client-api-gateway/src/pagination/GetDomainNamesPaginator.ts
+++ b/clients/client-api-gateway/src/pagination/GetDomainNamesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetDomainNames(
       throw new Error("Invalid client, expected APIGateway | APIGatewayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.position;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-api-gateway/src/pagination/GetModelsPaginator.ts b/clients/client-api-gateway/src/pagination/GetModelsPaginator.ts
index 4d3d480fb922..b1c32d6aa101 100644
--- a/clients/client-api-gateway/src/pagination/GetModelsPaginator.ts
+++ b/clients/client-api-gateway/src/pagination/GetModelsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateGetModels(
       throw new Error("Invalid client, expected APIGateway | APIGatewayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.position;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-api-gateway/src/pagination/GetResourcesPaginator.ts b/clients/client-api-gateway/src/pagination/GetResourcesPaginator.ts
index 51d58a91e047..9329e741a1cf 100644
--- a/clients/client-api-gateway/src/pagination/GetResourcesPaginator.ts
+++ b/clients/client-api-gateway/src/pagination/GetResourcesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetResources(
       throw new Error("Invalid client, expected APIGateway | APIGatewayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.position;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-api-gateway/src/pagination/GetRestApisPaginator.ts b/clients/client-api-gateway/src/pagination/GetRestApisPaginator.ts
index 775b83131ec2..eb12d1ac1694 100644
--- a/clients/client-api-gateway/src/pagination/GetRestApisPaginator.ts
+++ b/clients/client-api-gateway/src/pagination/GetRestApisPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateGetRestApis(
       throw new Error("Invalid client, expected APIGateway | APIGatewayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.position;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-api-gateway/src/pagination/GetUsagePaginator.ts b/clients/client-api-gateway/src/pagination/GetUsagePaginator.ts
index cf343e131fce..e9d87da9bc94 100644
--- a/clients/client-api-gateway/src/pagination/GetUsagePaginator.ts
+++ b/clients/client-api-gateway/src/pagination/GetUsagePaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateGetUsage(
       throw new Error("Invalid client, expected APIGateway | APIGatewayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.position;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-api-gateway/src/pagination/GetUsagePlanKeysPaginator.ts b/clients/client-api-gateway/src/pagination/GetUsagePlanKeysPaginator.ts
index 1cf6e8731fd1..495ec714ae56 100644
--- a/clients/client-api-gateway/src/pagination/GetUsagePlanKeysPaginator.ts
+++ b/clients/client-api-gateway/src/pagination/GetUsagePlanKeysPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetUsagePlanKeys(
       throw new Error("Invalid client, expected APIGateway | APIGatewayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.position;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-api-gateway/src/pagination/GetUsagePlansPaginator.ts b/clients/client-api-gateway/src/pagination/GetUsagePlansPaginator.ts
index c53fb9d027c4..7d5f24f878e4 100644
--- a/clients/client-api-gateway/src/pagination/GetUsagePlansPaginator.ts
+++ b/clients/client-api-gateway/src/pagination/GetUsagePlansPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetUsagePlans(
       throw new Error("Invalid client, expected APIGateway | APIGatewayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.position;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-api-gateway/src/pagination/GetVpcLinksPaginator.ts b/clients/client-api-gateway/src/pagination/GetVpcLinksPaginator.ts
index e3ae8754ef92..b81f23145a2a 100644
--- a/clients/client-api-gateway/src/pagination/GetVpcLinksPaginator.ts
+++ b/clients/client-api-gateway/src/pagination/GetVpcLinksPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateGetVpcLinks(
       throw new Error("Invalid client, expected APIGateway | APIGatewayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.position;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-app-mesh/src/pagination/ListGatewayRoutesPaginator.ts b/clients/client-app-mesh/src/pagination/ListGatewayRoutesPaginator.ts
index 71eef9d8d189..5c2c7a045132 100644
--- a/clients/client-app-mesh/src/pagination/ListGatewayRoutesPaginator.ts
+++ b/clients/client-app-mesh/src/pagination/ListGatewayRoutesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListGatewayRoutes(
       throw new Error("Invalid client, expected AppMesh | AppMeshClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-app-mesh/src/pagination/ListMeshesPaginator.ts b/clients/client-app-mesh/src/pagination/ListMeshesPaginator.ts
index 44f639cf9c28..bd5c09d238e7 100644
--- a/clients/client-app-mesh/src/pagination/ListMeshesPaginator.ts
+++ b/clients/client-app-mesh/src/pagination/ListMeshesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListMeshes(
       throw new Error("Invalid client, expected AppMesh | AppMeshClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-app-mesh/src/pagination/ListRoutesPaginator.ts b/clients/client-app-mesh/src/pagination/ListRoutesPaginator.ts
index 094c5f37e18b..fbe3fbe33fc2 100644
--- a/clients/client-app-mesh/src/pagination/ListRoutesPaginator.ts
+++ b/clients/client-app-mesh/src/pagination/ListRoutesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListRoutes(
       throw new Error("Invalid client, expected AppMesh | AppMeshClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-app-mesh/src/pagination/ListTagsForResourcePaginator.ts b/clients/client-app-mesh/src/pagination/ListTagsForResourcePaginator.ts
index 100d769c8587..1cbbc60629ef 100644
--- a/clients/client-app-mesh/src/pagination/ListTagsForResourcePaginator.ts
+++ b/clients/client-app-mesh/src/pagination/ListTagsForResourcePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTagsForResource(
       throw new Error("Invalid client, expected AppMesh | AppMeshClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-app-mesh/src/pagination/ListVirtualGatewaysPaginator.ts b/clients/client-app-mesh/src/pagination/ListVirtualGatewaysPaginator.ts
index 1b44b6a71854..636e934eed65 100644
--- a/clients/client-app-mesh/src/pagination/ListVirtualGatewaysPaginator.ts
+++ b/clients/client-app-mesh/src/pagination/ListVirtualGatewaysPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListVirtualGateways(
       throw new Error("Invalid client, expected AppMesh | AppMeshClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-app-mesh/src/pagination/ListVirtualNodesPaginator.ts b/clients/client-app-mesh/src/pagination/ListVirtualNodesPaginator.ts
index 24b1b0c9ebc3..0dff56f1b97f 100644
--- a/clients/client-app-mesh/src/pagination/ListVirtualNodesPaginator.ts
+++ b/clients/client-app-mesh/src/pagination/ListVirtualNodesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListVirtualNodes(
       throw new Error("Invalid client, expected AppMesh | AppMeshClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-app-mesh/src/pagination/ListVirtualRoutersPaginator.ts b/clients/client-app-mesh/src/pagination/ListVirtualRoutersPaginator.ts
index 09d7b755f1cc..abdfcade77d2 100644
--- a/clients/client-app-mesh/src/pagination/ListVirtualRoutersPaginator.ts
+++ b/clients/client-app-mesh/src/pagination/ListVirtualRoutersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListVirtualRouters(
       throw new Error("Invalid client, expected AppMesh | AppMeshClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-app-mesh/src/pagination/ListVirtualServicesPaginator.ts b/clients/client-app-mesh/src/pagination/ListVirtualServicesPaginator.ts
index c190e4901e38..12d1ca428aa0 100644
--- a/clients/client-app-mesh/src/pagination/ListVirtualServicesPaginator.ts
+++ b/clients/client-app-mesh/src/pagination/ListVirtualServicesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListVirtualServices(
       throw new Error("Invalid client, expected AppMesh | AppMeshClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-appconfig/src/pagination/ListApplicationsPaginator.ts b/clients/client-appconfig/src/pagination/ListApplicationsPaginator.ts
index cd68ad564e84..ba9eaf76e29b 100644
--- a/clients/client-appconfig/src/pagination/ListApplicationsPaginator.ts
+++ b/clients/client-appconfig/src/pagination/ListApplicationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListApplications(
       throw new Error("Invalid client, expected AppConfig | AppConfigClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-appconfig/src/pagination/ListConfigurationProfilesPaginator.ts b/clients/client-appconfig/src/pagination/ListConfigurationProfilesPaginator.ts
index 66da21378da1..b90748f33811 100644
--- a/clients/client-appconfig/src/pagination/ListConfigurationProfilesPaginator.ts
+++ b/clients/client-appconfig/src/pagination/ListConfigurationProfilesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListConfigurationProfiles(
       throw new Error("Invalid client, expected AppConfig | AppConfigClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-appconfig/src/pagination/ListDeploymentStrategiesPaginator.ts b/clients/client-appconfig/src/pagination/ListDeploymentStrategiesPaginator.ts
index a24631497ebb..eac2be25420b 100644
--- a/clients/client-appconfig/src/pagination/ListDeploymentStrategiesPaginator.ts
+++ b/clients/client-appconfig/src/pagination/ListDeploymentStrategiesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDeploymentStrategies(
       throw new Error("Invalid client, expected AppConfig | AppConfigClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-appconfig/src/pagination/ListDeploymentsPaginator.ts b/clients/client-appconfig/src/pagination/ListDeploymentsPaginator.ts
index 59a583bc9965..d968928a92d3 100644
--- a/clients/client-appconfig/src/pagination/ListDeploymentsPaginator.ts
+++ b/clients/client-appconfig/src/pagination/ListDeploymentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDeployments(
       throw new Error("Invalid client, expected AppConfig | AppConfigClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-appconfig/src/pagination/ListEnvironmentsPaginator.ts b/clients/client-appconfig/src/pagination/ListEnvironmentsPaginator.ts
index 7ee1a469c1e9..c67c8d27f293 100644
--- a/clients/client-appconfig/src/pagination/ListEnvironmentsPaginator.ts
+++ b/clients/client-appconfig/src/pagination/ListEnvironmentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEnvironments(
       throw new Error("Invalid client, expected AppConfig | AppConfigClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-appconfig/src/pagination/ListHostedConfigurationVersionsPaginator.ts b/clients/client-appconfig/src/pagination/ListHostedConfigurationVersionsPaginator.ts
index bf82078966b3..dfcecbaf541c 100644
--- a/clients/client-appconfig/src/pagination/ListHostedConfigurationVersionsPaginator.ts
+++ b/clients/client-appconfig/src/pagination/ListHostedConfigurationVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListHostedConfigurationVersions(
       throw new Error("Invalid client, expected AppConfig | AppConfigClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-appflow/src/pagination/DescribeConnectorProfilesPaginator.ts b/clients/client-appflow/src/pagination/DescribeConnectorProfilesPaginator.ts
index 5ef3ab36f1ea..8331d0826c69 100644
--- a/clients/client-appflow/src/pagination/DescribeConnectorProfilesPaginator.ts
+++ b/clients/client-appflow/src/pagination/DescribeConnectorProfilesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeConnectorProfiles(
       throw new Error("Invalid client, expected Appflow | AppflowClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-appflow/src/pagination/DescribeConnectorsPaginator.ts b/clients/client-appflow/src/pagination/DescribeConnectorsPaginator.ts
index 6b75aaab8722..680d6338dabe 100644
--- a/clients/client-appflow/src/pagination/DescribeConnectorsPaginator.ts
+++ b/clients/client-appflow/src/pagination/DescribeConnectorsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeConnectors(
       throw new Error("Invalid client, expected Appflow | AppflowClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-appflow/src/pagination/DescribeFlowExecutionRecordsPaginator.ts b/clients/client-appflow/src/pagination/DescribeFlowExecutionRecordsPaginator.ts
index 958bd835bde9..5f655bed6194 100644
--- a/clients/client-appflow/src/pagination/DescribeFlowExecutionRecordsPaginator.ts
+++ b/clients/client-appflow/src/pagination/DescribeFlowExecutionRecordsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeFlowExecutionRecords(
       throw new Error("Invalid client, expected Appflow | AppflowClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-appflow/src/pagination/ListConnectorsPaginator.ts b/clients/client-appflow/src/pagination/ListConnectorsPaginator.ts
index 7cbe7dd3d1a9..278e73c9d6e2 100644
--- a/clients/client-appflow/src/pagination/ListConnectorsPaginator.ts
+++ b/clients/client-appflow/src/pagination/ListConnectorsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListConnectors(
       throw new Error("Invalid client, expected Appflow | AppflowClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-appflow/src/pagination/ListFlowsPaginator.ts b/clients/client-appflow/src/pagination/ListFlowsPaginator.ts
index 5175fef67d0a..0c74399ce507 100644
--- a/clients/client-appflow/src/pagination/ListFlowsPaginator.ts
+++ b/clients/client-appflow/src/pagination/ListFlowsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListFlows(
       throw new Error("Invalid client, expected Appflow | AppflowClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-application-auto-scaling/src/pagination/DescribeScalableTargetsPaginator.ts b/clients/client-application-auto-scaling/src/pagination/DescribeScalableTargetsPaginator.ts
index 42b9b93bccea..0c2ce911ac7f 100644
--- a/clients/client-application-auto-scaling/src/pagination/DescribeScalableTargetsPaginator.ts
+++ b/clients/client-application-auto-scaling/src/pagination/DescribeScalableTargetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeScalableTargets(
       throw new Error("Invalid client, expected ApplicationAutoScaling | ApplicationAutoScalingClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-application-auto-scaling/src/pagination/DescribeScalingActivitiesPaginator.ts b/clients/client-application-auto-scaling/src/pagination/DescribeScalingActivitiesPaginator.ts
index b50888a5fa49..326e4c28012a 100644
--- a/clients/client-application-auto-scaling/src/pagination/DescribeScalingActivitiesPaginator.ts
+++ b/clients/client-application-auto-scaling/src/pagination/DescribeScalingActivitiesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeScalingActivities(
       throw new Error("Invalid client, expected ApplicationAutoScaling | ApplicationAutoScalingClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-application-auto-scaling/src/pagination/DescribeScalingPoliciesPaginator.ts b/clients/client-application-auto-scaling/src/pagination/DescribeScalingPoliciesPaginator.ts
index 9150930f9322..0302128992a0 100644
--- a/clients/client-application-auto-scaling/src/pagination/DescribeScalingPoliciesPaginator.ts
+++ b/clients/client-application-auto-scaling/src/pagination/DescribeScalingPoliciesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeScalingPolicies(
       throw new Error("Invalid client, expected ApplicationAutoScaling | ApplicationAutoScalingClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-application-auto-scaling/src/pagination/DescribeScheduledActionsPaginator.ts b/clients/client-application-auto-scaling/src/pagination/DescribeScheduledActionsPaginator.ts
index 08f29f5cc8da..36d4999e14d7 100644
--- a/clients/client-application-auto-scaling/src/pagination/DescribeScheduledActionsPaginator.ts
+++ b/clients/client-application-auto-scaling/src/pagination/DescribeScheduledActionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeScheduledActions(
       throw new Error("Invalid client, expected ApplicationAutoScaling | ApplicationAutoScalingClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-application-discovery-service/src/pagination/DescribeContinuousExportsPaginator.ts b/clients/client-application-discovery-service/src/pagination/DescribeContinuousExportsPaginator.ts
index e51286cfb15c..9c249950d69e 100644
--- a/clients/client-application-discovery-service/src/pagination/DescribeContinuousExportsPaginator.ts
+++ b/clients/client-application-discovery-service/src/pagination/DescribeContinuousExportsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeContinuousExports(
       throw new Error("Invalid client, expected ApplicationDiscoveryService | ApplicationDiscoveryServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-application-discovery-service/src/pagination/DescribeImportTasksPaginator.ts b/clients/client-application-discovery-service/src/pagination/DescribeImportTasksPaginator.ts
index 1b98da4c03f6..5c3be06b7707 100644
--- a/clients/client-application-discovery-service/src/pagination/DescribeImportTasksPaginator.ts
+++ b/clients/client-application-discovery-service/src/pagination/DescribeImportTasksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeImportTasks(
       throw new Error("Invalid client, expected ApplicationDiscoveryService | ApplicationDiscoveryServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-application-insights/src/pagination/ListApplicationsPaginator.ts b/clients/client-application-insights/src/pagination/ListApplicationsPaginator.ts
index 67a666214268..a4aaf696614f 100644
--- a/clients/client-application-insights/src/pagination/ListApplicationsPaginator.ts
+++ b/clients/client-application-insights/src/pagination/ListApplicationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListApplications(
       throw new Error("Invalid client, expected ApplicationInsights | ApplicationInsightsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-application-insights/src/pagination/ListComponentsPaginator.ts b/clients/client-application-insights/src/pagination/ListComponentsPaginator.ts
index 907936122a0b..daa5bbc01fd2 100644
--- a/clients/client-application-insights/src/pagination/ListComponentsPaginator.ts
+++ b/clients/client-application-insights/src/pagination/ListComponentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListComponents(
       throw new Error("Invalid client, expected ApplicationInsights | ApplicationInsightsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-application-insights/src/pagination/ListConfigurationHistoryPaginator.ts b/clients/client-application-insights/src/pagination/ListConfigurationHistoryPaginator.ts
index 0791d00f817d..522450c766c0 100644
--- a/clients/client-application-insights/src/pagination/ListConfigurationHistoryPaginator.ts
+++ b/clients/client-application-insights/src/pagination/ListConfigurationHistoryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListConfigurationHistory(
       throw new Error("Invalid client, expected ApplicationInsights | ApplicationInsightsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-application-insights/src/pagination/ListLogPatternSetsPaginator.ts b/clients/client-application-insights/src/pagination/ListLogPatternSetsPaginator.ts
index 186113a8e34e..d366ab539cfb 100644
--- a/clients/client-application-insights/src/pagination/ListLogPatternSetsPaginator.ts
+++ b/clients/client-application-insights/src/pagination/ListLogPatternSetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListLogPatternSets(
       throw new Error("Invalid client, expected ApplicationInsights | ApplicationInsightsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-application-insights/src/pagination/ListLogPatternsPaginator.ts b/clients/client-application-insights/src/pagination/ListLogPatternsPaginator.ts
index 558cedb074ea..0bec76d20676 100644
--- a/clients/client-application-insights/src/pagination/ListLogPatternsPaginator.ts
+++ b/clients/client-application-insights/src/pagination/ListLogPatternsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListLogPatterns(
       throw new Error("Invalid client, expected ApplicationInsights | ApplicationInsightsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-application-insights/src/pagination/ListProblemsPaginator.ts b/clients/client-application-insights/src/pagination/ListProblemsPaginator.ts
index d6a369c1c633..a6c7c21fdcc6 100644
--- a/clients/client-application-insights/src/pagination/ListProblemsPaginator.ts
+++ b/clients/client-application-insights/src/pagination/ListProblemsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListProblems(
       throw new Error("Invalid client, expected ApplicationInsights | ApplicationInsightsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-applicationcostprofiler/src/pagination/ListReportDefinitionsPaginator.ts b/clients/client-applicationcostprofiler/src/pagination/ListReportDefinitionsPaginator.ts
index a24968186fc1..7e0be66106e8 100644
--- a/clients/client-applicationcostprofiler/src/pagination/ListReportDefinitionsPaginator.ts
+++ b/clients/client-applicationcostprofiler/src/pagination/ListReportDefinitionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListReportDefinitions(
       throw new Error("Invalid client, expected ApplicationCostProfiler | ApplicationCostProfilerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-apprunner/src/pagination/DescribeCustomDomainsPaginator.ts b/clients/client-apprunner/src/pagination/DescribeCustomDomainsPaginator.ts
index 52c1f01e3b00..de85421b583e 100644
--- a/clients/client-apprunner/src/pagination/DescribeCustomDomainsPaginator.ts
+++ b/clients/client-apprunner/src/pagination/DescribeCustomDomainsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeCustomDomains(
       throw new Error("Invalid client, expected AppRunner | AppRunnerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-apprunner/src/pagination/ListAutoScalingConfigurationsPaginator.ts b/clients/client-apprunner/src/pagination/ListAutoScalingConfigurationsPaginator.ts
index 226b56cd7fd8..ffaa0dea6b8f 100644
--- a/clients/client-apprunner/src/pagination/ListAutoScalingConfigurationsPaginator.ts
+++ b/clients/client-apprunner/src/pagination/ListAutoScalingConfigurationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAutoScalingConfigurations(
       throw new Error("Invalid client, expected AppRunner | AppRunnerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-apprunner/src/pagination/ListConnectionsPaginator.ts b/clients/client-apprunner/src/pagination/ListConnectionsPaginator.ts
index d3c5d538dd91..68a37e388c51 100644
--- a/clients/client-apprunner/src/pagination/ListConnectionsPaginator.ts
+++ b/clients/client-apprunner/src/pagination/ListConnectionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListConnections(
       throw new Error("Invalid client, expected AppRunner | AppRunnerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-apprunner/src/pagination/ListOperationsPaginator.ts b/clients/client-apprunner/src/pagination/ListOperationsPaginator.ts
index 1c1580003dd7..f012281e72dd 100644
--- a/clients/client-apprunner/src/pagination/ListOperationsPaginator.ts
+++ b/clients/client-apprunner/src/pagination/ListOperationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListOperations(
       throw new Error("Invalid client, expected AppRunner | AppRunnerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-apprunner/src/pagination/ListServicesPaginator.ts b/clients/client-apprunner/src/pagination/ListServicesPaginator.ts
index 1d5a95a9acb4..a69eda0a9960 100644
--- a/clients/client-apprunner/src/pagination/ListServicesPaginator.ts
+++ b/clients/client-apprunner/src/pagination/ListServicesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListServices(
       throw new Error("Invalid client, expected AppRunner | AppRunnerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-apprunner/src/pagination/ListVpcConnectorsPaginator.ts b/clients/client-apprunner/src/pagination/ListVpcConnectorsPaginator.ts
index 82ae98ce2290..793851ef8f40 100644
--- a/clients/client-apprunner/src/pagination/ListVpcConnectorsPaginator.ts
+++ b/clients/client-apprunner/src/pagination/ListVpcConnectorsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListVpcConnectors(
       throw new Error("Invalid client, expected AppRunner | AppRunnerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-appstream/src/pagination/DescribeImagePermissionsPaginator.ts b/clients/client-appstream/src/pagination/DescribeImagePermissionsPaginator.ts
index d8ea6ff59bc8..38fa315720ab 100644
--- a/clients/client-appstream/src/pagination/DescribeImagePermissionsPaginator.ts
+++ b/clients/client-appstream/src/pagination/DescribeImagePermissionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeImagePermissions(
       throw new Error("Invalid client, expected AppStream | AppStreamClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-appstream/src/pagination/DescribeImagesPaginator.ts b/clients/client-appstream/src/pagination/DescribeImagesPaginator.ts
index fa4e33182c45..4678b9e4cd45 100644
--- a/clients/client-appstream/src/pagination/DescribeImagesPaginator.ts
+++ b/clients/client-appstream/src/pagination/DescribeImagesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeImages(
       throw new Error("Invalid client, expected AppStream | AppStreamClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-athena/src/pagination/GetQueryResultsPaginator.ts b/clients/client-athena/src/pagination/GetQueryResultsPaginator.ts
index 9c9064d35bc1..23f55e537b89 100644
--- a/clients/client-athena/src/pagination/GetQueryResultsPaginator.ts
+++ b/clients/client-athena/src/pagination/GetQueryResultsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetQueryResults(
       throw new Error("Invalid client, expected Athena | AthenaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-athena/src/pagination/ListDataCatalogsPaginator.ts b/clients/client-athena/src/pagination/ListDataCatalogsPaginator.ts
index 46122da2dd02..68f920932ea5 100644
--- a/clients/client-athena/src/pagination/ListDataCatalogsPaginator.ts
+++ b/clients/client-athena/src/pagination/ListDataCatalogsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDataCatalogs(
       throw new Error("Invalid client, expected Athena | AthenaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-athena/src/pagination/ListDatabasesPaginator.ts b/clients/client-athena/src/pagination/ListDatabasesPaginator.ts
index 90a7ac0c0bf8..8fb0dd59ba7e 100644
--- a/clients/client-athena/src/pagination/ListDatabasesPaginator.ts
+++ b/clients/client-athena/src/pagination/ListDatabasesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDatabases(
       throw new Error("Invalid client, expected Athena | AthenaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-athena/src/pagination/ListNamedQueriesPaginator.ts b/clients/client-athena/src/pagination/ListNamedQueriesPaginator.ts
index 6c0f8ee38ec4..dcd0ac5a7285 100644
--- a/clients/client-athena/src/pagination/ListNamedQueriesPaginator.ts
+++ b/clients/client-athena/src/pagination/ListNamedQueriesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListNamedQueries(
       throw new Error("Invalid client, expected Athena | AthenaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-athena/src/pagination/ListPreparedStatementsPaginator.ts b/clients/client-athena/src/pagination/ListPreparedStatementsPaginator.ts
index 9d9138adfa13..c6b04ff32be6 100644
--- a/clients/client-athena/src/pagination/ListPreparedStatementsPaginator.ts
+++ b/clients/client-athena/src/pagination/ListPreparedStatementsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPreparedStatements(
       throw new Error("Invalid client, expected Athena | AthenaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-athena/src/pagination/ListQueryExecutionsPaginator.ts b/clients/client-athena/src/pagination/ListQueryExecutionsPaginator.ts
index c03490c403f9..4a0239e7f83d 100644
--- a/clients/client-athena/src/pagination/ListQueryExecutionsPaginator.ts
+++ b/clients/client-athena/src/pagination/ListQueryExecutionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListQueryExecutions(
       throw new Error("Invalid client, expected Athena | AthenaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-athena/src/pagination/ListTableMetadataPaginator.ts b/clients/client-athena/src/pagination/ListTableMetadataPaginator.ts
index a12dfd759293..3bcc5f6c7972 100644
--- a/clients/client-athena/src/pagination/ListTableMetadataPaginator.ts
+++ b/clients/client-athena/src/pagination/ListTableMetadataPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTableMetadata(
       throw new Error("Invalid client, expected Athena | AthenaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-athena/src/pagination/ListTagsForResourcePaginator.ts b/clients/client-athena/src/pagination/ListTagsForResourcePaginator.ts
index c0b2a7b8f7ae..9ad654861555 100644
--- a/clients/client-athena/src/pagination/ListTagsForResourcePaginator.ts
+++ b/clients/client-athena/src/pagination/ListTagsForResourcePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTagsForResource(
       throw new Error("Invalid client, expected Athena | AthenaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-athena/src/pagination/ListWorkGroupsPaginator.ts b/clients/client-athena/src/pagination/ListWorkGroupsPaginator.ts
index 5c32c6ddd4e5..1881f0c70846 100644
--- a/clients/client-athena/src/pagination/ListWorkGroupsPaginator.ts
+++ b/clients/client-athena/src/pagination/ListWorkGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListWorkGroups(
       throw new Error("Invalid client, expected Athena | AthenaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-auditmanager/src/pagination/GetChangeLogsPaginator.ts b/clients/client-auditmanager/src/pagination/GetChangeLogsPaginator.ts
index cbdfa72bb6cd..c188e5ab9998 100644
--- a/clients/client-auditmanager/src/pagination/GetChangeLogsPaginator.ts
+++ b/clients/client-auditmanager/src/pagination/GetChangeLogsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetChangeLogs(
       throw new Error("Invalid client, expected AuditManager | AuditManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-auditmanager/src/pagination/GetDelegationsPaginator.ts b/clients/client-auditmanager/src/pagination/GetDelegationsPaginator.ts
index 0a8c0cf8d3c4..96cfe01fee47 100644
--- a/clients/client-auditmanager/src/pagination/GetDelegationsPaginator.ts
+++ b/clients/client-auditmanager/src/pagination/GetDelegationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetDelegations(
       throw new Error("Invalid client, expected AuditManager | AuditManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-auditmanager/src/pagination/GetEvidenceByEvidenceFolderPaginator.ts b/clients/client-auditmanager/src/pagination/GetEvidenceByEvidenceFolderPaginator.ts
index 5ed49bfcfc38..d0ee0330dc0f 100644
--- a/clients/client-auditmanager/src/pagination/GetEvidenceByEvidenceFolderPaginator.ts
+++ b/clients/client-auditmanager/src/pagination/GetEvidenceByEvidenceFolderPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetEvidenceByEvidenceFolder(
       throw new Error("Invalid client, expected AuditManager | AuditManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-auditmanager/src/pagination/GetEvidenceFoldersByAssessmentControlPaginator.ts b/clients/client-auditmanager/src/pagination/GetEvidenceFoldersByAssessmentControlPaginator.ts
index a5d83cfa6b29..2bf6c1f95181 100644
--- a/clients/client-auditmanager/src/pagination/GetEvidenceFoldersByAssessmentControlPaginator.ts
+++ b/clients/client-auditmanager/src/pagination/GetEvidenceFoldersByAssessmentControlPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetEvidenceFoldersByAssessmentControl(
       throw new Error("Invalid client, expected AuditManager | AuditManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-auditmanager/src/pagination/GetEvidenceFoldersByAssessmentPaginator.ts b/clients/client-auditmanager/src/pagination/GetEvidenceFoldersByAssessmentPaginator.ts
index 68d0426bb6d8..ad123bb1b693 100644
--- a/clients/client-auditmanager/src/pagination/GetEvidenceFoldersByAssessmentPaginator.ts
+++ b/clients/client-auditmanager/src/pagination/GetEvidenceFoldersByAssessmentPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetEvidenceFoldersByAssessment(
       throw new Error("Invalid client, expected AuditManager | AuditManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-auditmanager/src/pagination/ListAssessmentControlInsightsByControlDomainPaginator.ts b/clients/client-auditmanager/src/pagination/ListAssessmentControlInsightsByControlDomainPaginator.ts
index 61bc2b1b7941..b3cfed7c8205 100644
--- a/clients/client-auditmanager/src/pagination/ListAssessmentControlInsightsByControlDomainPaginator.ts
+++ b/clients/client-auditmanager/src/pagination/ListAssessmentControlInsightsByControlDomainPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAssessmentControlInsightsByControlDomain(
       throw new Error("Invalid client, expected AuditManager | AuditManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-auditmanager/src/pagination/ListAssessmentFrameworkShareRequestsPaginator.ts b/clients/client-auditmanager/src/pagination/ListAssessmentFrameworkShareRequestsPaginator.ts
index 08fbe52bd535..e5cc462f53cc 100644
--- a/clients/client-auditmanager/src/pagination/ListAssessmentFrameworkShareRequestsPaginator.ts
+++ b/clients/client-auditmanager/src/pagination/ListAssessmentFrameworkShareRequestsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAssessmentFrameworkShareRequests(
       throw new Error("Invalid client, expected AuditManager | AuditManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-auditmanager/src/pagination/ListAssessmentFrameworksPaginator.ts b/clients/client-auditmanager/src/pagination/ListAssessmentFrameworksPaginator.ts
index 98370ea1fad1..16bda57b2376 100644
--- a/clients/client-auditmanager/src/pagination/ListAssessmentFrameworksPaginator.ts
+++ b/clients/client-auditmanager/src/pagination/ListAssessmentFrameworksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAssessmentFrameworks(
       throw new Error("Invalid client, expected AuditManager | AuditManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-auditmanager/src/pagination/ListAssessmentReportsPaginator.ts b/clients/client-auditmanager/src/pagination/ListAssessmentReportsPaginator.ts
index 84e5a1698dbd..b008f7656670 100644
--- a/clients/client-auditmanager/src/pagination/ListAssessmentReportsPaginator.ts
+++ b/clients/client-auditmanager/src/pagination/ListAssessmentReportsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAssessmentReports(
       throw new Error("Invalid client, expected AuditManager | AuditManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-auditmanager/src/pagination/ListAssessmentsPaginator.ts b/clients/client-auditmanager/src/pagination/ListAssessmentsPaginator.ts
index 756c14da37fb..579a05b0a7de 100644
--- a/clients/client-auditmanager/src/pagination/ListAssessmentsPaginator.ts
+++ b/clients/client-auditmanager/src/pagination/ListAssessmentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAssessments(
       throw new Error("Invalid client, expected AuditManager | AuditManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-auditmanager/src/pagination/ListControlDomainInsightsByAssessmentPaginator.ts b/clients/client-auditmanager/src/pagination/ListControlDomainInsightsByAssessmentPaginator.ts
index c52f0b2b182e..46dd8496143e 100644
--- a/clients/client-auditmanager/src/pagination/ListControlDomainInsightsByAssessmentPaginator.ts
+++ b/clients/client-auditmanager/src/pagination/ListControlDomainInsightsByAssessmentPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListControlDomainInsightsByAssessment(
       throw new Error("Invalid client, expected AuditManager | AuditManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-auditmanager/src/pagination/ListControlDomainInsightsPaginator.ts b/clients/client-auditmanager/src/pagination/ListControlDomainInsightsPaginator.ts
index fe80776cdf96..ccbda807ab09 100644
--- a/clients/client-auditmanager/src/pagination/ListControlDomainInsightsPaginator.ts
+++ b/clients/client-auditmanager/src/pagination/ListControlDomainInsightsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListControlDomainInsights(
       throw new Error("Invalid client, expected AuditManager | AuditManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-auditmanager/src/pagination/ListControlInsightsByControlDomainPaginator.ts b/clients/client-auditmanager/src/pagination/ListControlInsightsByControlDomainPaginator.ts
index 24d707446671..654f524c4f27 100644
--- a/clients/client-auditmanager/src/pagination/ListControlInsightsByControlDomainPaginator.ts
+++ b/clients/client-auditmanager/src/pagination/ListControlInsightsByControlDomainPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListControlInsightsByControlDomain(
       throw new Error("Invalid client, expected AuditManager | AuditManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-auditmanager/src/pagination/ListControlsPaginator.ts b/clients/client-auditmanager/src/pagination/ListControlsPaginator.ts
index 7248f3fc2233..e48cbb2cf35f 100644
--- a/clients/client-auditmanager/src/pagination/ListControlsPaginator.ts
+++ b/clients/client-auditmanager/src/pagination/ListControlsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListControls(
       throw new Error("Invalid client, expected AuditManager | AuditManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-auditmanager/src/pagination/ListKeywordsForDataSourcePaginator.ts b/clients/client-auditmanager/src/pagination/ListKeywordsForDataSourcePaginator.ts
index 06c8cad95041..182b34050fb0 100644
--- a/clients/client-auditmanager/src/pagination/ListKeywordsForDataSourcePaginator.ts
+++ b/clients/client-auditmanager/src/pagination/ListKeywordsForDataSourcePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListKeywordsForDataSource(
       throw new Error("Invalid client, expected AuditManager | AuditManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-auditmanager/src/pagination/ListNotificationsPaginator.ts b/clients/client-auditmanager/src/pagination/ListNotificationsPaginator.ts
index fc2756567252..3e83181cea16 100644
--- a/clients/client-auditmanager/src/pagination/ListNotificationsPaginator.ts
+++ b/clients/client-auditmanager/src/pagination/ListNotificationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListNotifications(
       throw new Error("Invalid client, expected AuditManager | AuditManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-auto-scaling/src/pagination/DescribeAutoScalingGroupsPaginator.ts b/clients/client-auto-scaling/src/pagination/DescribeAutoScalingGroupsPaginator.ts
index 318ad6b1c91d..f42226b3d8c7 100644
--- a/clients/client-auto-scaling/src/pagination/DescribeAutoScalingGroupsPaginator.ts
+++ b/clients/client-auto-scaling/src/pagination/DescribeAutoScalingGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeAutoScalingGroups(
       throw new Error("Invalid client, expected AutoScaling | AutoScalingClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-auto-scaling/src/pagination/DescribeAutoScalingInstancesPaginator.ts b/clients/client-auto-scaling/src/pagination/DescribeAutoScalingInstancesPaginator.ts
index 4c3a506ff685..1ff54e952719 100644
--- a/clients/client-auto-scaling/src/pagination/DescribeAutoScalingInstancesPaginator.ts
+++ b/clients/client-auto-scaling/src/pagination/DescribeAutoScalingInstancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeAutoScalingInstances(
       throw new Error("Invalid client, expected AutoScaling | AutoScalingClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-auto-scaling/src/pagination/DescribeLaunchConfigurationsPaginator.ts b/clients/client-auto-scaling/src/pagination/DescribeLaunchConfigurationsPaginator.ts
index 7a1a870184df..2dbe27e17ece 100644
--- a/clients/client-auto-scaling/src/pagination/DescribeLaunchConfigurationsPaginator.ts
+++ b/clients/client-auto-scaling/src/pagination/DescribeLaunchConfigurationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeLaunchConfigurations(
       throw new Error("Invalid client, expected AutoScaling | AutoScalingClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-auto-scaling/src/pagination/DescribeNotificationConfigurationsPaginator.ts b/clients/client-auto-scaling/src/pagination/DescribeNotificationConfigurationsPaginator.ts
index 8c1a5aa7801b..ac1463838563 100644
--- a/clients/client-auto-scaling/src/pagination/DescribeNotificationConfigurationsPaginator.ts
+++ b/clients/client-auto-scaling/src/pagination/DescribeNotificationConfigurationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeNotificationConfigurations(
       throw new Error("Invalid client, expected AutoScaling | AutoScalingClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-auto-scaling/src/pagination/DescribePoliciesPaginator.ts b/clients/client-auto-scaling/src/pagination/DescribePoliciesPaginator.ts
index 0333172695b8..b2c9b522ec64 100644
--- a/clients/client-auto-scaling/src/pagination/DescribePoliciesPaginator.ts
+++ b/clients/client-auto-scaling/src/pagination/DescribePoliciesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribePolicies(
       throw new Error("Invalid client, expected AutoScaling | AutoScalingClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-auto-scaling/src/pagination/DescribeScalingActivitiesPaginator.ts b/clients/client-auto-scaling/src/pagination/DescribeScalingActivitiesPaginator.ts
index cdaeb02579ee..aea953d8d9a3 100644
--- a/clients/client-auto-scaling/src/pagination/DescribeScalingActivitiesPaginator.ts
+++ b/clients/client-auto-scaling/src/pagination/DescribeScalingActivitiesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeScalingActivities(
       throw new Error("Invalid client, expected AutoScaling | AutoScalingClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-auto-scaling/src/pagination/DescribeScheduledActionsPaginator.ts b/clients/client-auto-scaling/src/pagination/DescribeScheduledActionsPaginator.ts
index c92c4199b875..9388d13456ed 100644
--- a/clients/client-auto-scaling/src/pagination/DescribeScheduledActionsPaginator.ts
+++ b/clients/client-auto-scaling/src/pagination/DescribeScheduledActionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeScheduledActions(
       throw new Error("Invalid client, expected AutoScaling | AutoScalingClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-auto-scaling/src/pagination/DescribeTagsPaginator.ts b/clients/client-auto-scaling/src/pagination/DescribeTagsPaginator.ts
index 0737574a1931..841d21852222 100644
--- a/clients/client-auto-scaling/src/pagination/DescribeTagsPaginator.ts
+++ b/clients/client-auto-scaling/src/pagination/DescribeTagsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeTags(
       throw new Error("Invalid client, expected AutoScaling | AutoScalingClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-backup-gateway/src/pagination/ListGatewaysPaginator.ts b/clients/client-backup-gateway/src/pagination/ListGatewaysPaginator.ts
index b5d931c9a8ef..3a6a81e98482 100644
--- a/clients/client-backup-gateway/src/pagination/ListGatewaysPaginator.ts
+++ b/clients/client-backup-gateway/src/pagination/ListGatewaysPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListGateways(
       throw new Error("Invalid client, expected BackupGateway | BackupGatewayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-backup-gateway/src/pagination/ListHypervisorsPaginator.ts b/clients/client-backup-gateway/src/pagination/ListHypervisorsPaginator.ts
index 762d9ac81e2b..63ea34ef7dbb 100644
--- a/clients/client-backup-gateway/src/pagination/ListHypervisorsPaginator.ts
+++ b/clients/client-backup-gateway/src/pagination/ListHypervisorsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListHypervisors(
       throw new Error("Invalid client, expected BackupGateway | BackupGatewayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-backup-gateway/src/pagination/ListVirtualMachinesPaginator.ts b/clients/client-backup-gateway/src/pagination/ListVirtualMachinesPaginator.ts
index cad89e09f5f3..ba16863b8c94 100644
--- a/clients/client-backup-gateway/src/pagination/ListVirtualMachinesPaginator.ts
+++ b/clients/client-backup-gateway/src/pagination/ListVirtualMachinesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListVirtualMachines(
       throw new Error("Invalid client, expected BackupGateway | BackupGatewayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-backup/src/pagination/ListBackupJobsPaginator.ts b/clients/client-backup/src/pagination/ListBackupJobsPaginator.ts
index 51f2e651a512..59d205095d2f 100644
--- a/clients/client-backup/src/pagination/ListBackupJobsPaginator.ts
+++ b/clients/client-backup/src/pagination/ListBackupJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListBackupJobs(
       throw new Error("Invalid client, expected Backup | BackupClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-backup/src/pagination/ListBackupPlanTemplatesPaginator.ts b/clients/client-backup/src/pagination/ListBackupPlanTemplatesPaginator.ts
index 6753afeb26a5..2f17b7952d85 100644
--- a/clients/client-backup/src/pagination/ListBackupPlanTemplatesPaginator.ts
+++ b/clients/client-backup/src/pagination/ListBackupPlanTemplatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListBackupPlanTemplates(
       throw new Error("Invalid client, expected Backup | BackupClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-backup/src/pagination/ListBackupPlanVersionsPaginator.ts b/clients/client-backup/src/pagination/ListBackupPlanVersionsPaginator.ts
index 9b226ccdb6a2..d90f4729d78f 100644
--- a/clients/client-backup/src/pagination/ListBackupPlanVersionsPaginator.ts
+++ b/clients/client-backup/src/pagination/ListBackupPlanVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListBackupPlanVersions(
       throw new Error("Invalid client, expected Backup | BackupClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-backup/src/pagination/ListBackupPlansPaginator.ts b/clients/client-backup/src/pagination/ListBackupPlansPaginator.ts
index 3d80ca1f9d27..be33f69d9273 100644
--- a/clients/client-backup/src/pagination/ListBackupPlansPaginator.ts
+++ b/clients/client-backup/src/pagination/ListBackupPlansPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListBackupPlans(
       throw new Error("Invalid client, expected Backup | BackupClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-backup/src/pagination/ListBackupSelectionsPaginator.ts b/clients/client-backup/src/pagination/ListBackupSelectionsPaginator.ts
index 11b3256ab63d..a5aeea20b216 100644
--- a/clients/client-backup/src/pagination/ListBackupSelectionsPaginator.ts
+++ b/clients/client-backup/src/pagination/ListBackupSelectionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListBackupSelections(
       throw new Error("Invalid client, expected Backup | BackupClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-backup/src/pagination/ListBackupVaultsPaginator.ts b/clients/client-backup/src/pagination/ListBackupVaultsPaginator.ts
index ec0393c7305e..a62abe144071 100644
--- a/clients/client-backup/src/pagination/ListBackupVaultsPaginator.ts
+++ b/clients/client-backup/src/pagination/ListBackupVaultsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListBackupVaults(
       throw new Error("Invalid client, expected Backup | BackupClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-backup/src/pagination/ListCopyJobsPaginator.ts b/clients/client-backup/src/pagination/ListCopyJobsPaginator.ts
index 906d4991f29a..484a87785665 100644
--- a/clients/client-backup/src/pagination/ListCopyJobsPaginator.ts
+++ b/clients/client-backup/src/pagination/ListCopyJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCopyJobs(
       throw new Error("Invalid client, expected Backup | BackupClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-backup/src/pagination/ListFrameworksPaginator.ts b/clients/client-backup/src/pagination/ListFrameworksPaginator.ts
index e9571f82837c..ad60b5c61ce8 100644
--- a/clients/client-backup/src/pagination/ListFrameworksPaginator.ts
+++ b/clients/client-backup/src/pagination/ListFrameworksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFrameworks(
       throw new Error("Invalid client, expected Backup | BackupClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-backup/src/pagination/ListProtectedResourcesPaginator.ts b/clients/client-backup/src/pagination/ListProtectedResourcesPaginator.ts
index bb25333ef6bd..5e1e0d1a8108 100644
--- a/clients/client-backup/src/pagination/ListProtectedResourcesPaginator.ts
+++ b/clients/client-backup/src/pagination/ListProtectedResourcesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListProtectedResources(
       throw new Error("Invalid client, expected Backup | BackupClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-backup/src/pagination/ListRecoveryPointsByBackupVaultPaginator.ts b/clients/client-backup/src/pagination/ListRecoveryPointsByBackupVaultPaginator.ts
index 7fb056d7d477..36d182221c81 100644
--- a/clients/client-backup/src/pagination/ListRecoveryPointsByBackupVaultPaginator.ts
+++ b/clients/client-backup/src/pagination/ListRecoveryPointsByBackupVaultPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRecoveryPointsByBackupVault(
       throw new Error("Invalid client, expected Backup | BackupClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-backup/src/pagination/ListRecoveryPointsByResourcePaginator.ts b/clients/client-backup/src/pagination/ListRecoveryPointsByResourcePaginator.ts
index d52425a45fc7..fba78af41137 100644
--- a/clients/client-backup/src/pagination/ListRecoveryPointsByResourcePaginator.ts
+++ b/clients/client-backup/src/pagination/ListRecoveryPointsByResourcePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRecoveryPointsByResource(
       throw new Error("Invalid client, expected Backup | BackupClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-backup/src/pagination/ListReportJobsPaginator.ts b/clients/client-backup/src/pagination/ListReportJobsPaginator.ts
index 976a42143819..9ca6a15aaddd 100644
--- a/clients/client-backup/src/pagination/ListReportJobsPaginator.ts
+++ b/clients/client-backup/src/pagination/ListReportJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListReportJobs(
       throw new Error("Invalid client, expected Backup | BackupClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-backup/src/pagination/ListReportPlansPaginator.ts b/clients/client-backup/src/pagination/ListReportPlansPaginator.ts
index bad9d1db20e2..7b4abe5a7f7b 100644
--- a/clients/client-backup/src/pagination/ListReportPlansPaginator.ts
+++ b/clients/client-backup/src/pagination/ListReportPlansPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListReportPlans(
       throw new Error("Invalid client, expected Backup | BackupClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-backup/src/pagination/ListRestoreJobsPaginator.ts b/clients/client-backup/src/pagination/ListRestoreJobsPaginator.ts
index 04a182938981..ca3616355cd2 100644
--- a/clients/client-backup/src/pagination/ListRestoreJobsPaginator.ts
+++ b/clients/client-backup/src/pagination/ListRestoreJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRestoreJobs(
       throw new Error("Invalid client, expected Backup | BackupClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-backup/src/pagination/ListTagsPaginator.ts b/clients/client-backup/src/pagination/ListTagsPaginator.ts
index 5babd1d57445..e800761bcb6a 100644
--- a/clients/client-backup/src/pagination/ListTagsPaginator.ts
+++ b/clients/client-backup/src/pagination/ListTagsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListTags(
       throw new Error("Invalid client, expected Backup | BackupClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-batch/src/pagination/DescribeComputeEnvironmentsPaginator.ts b/clients/client-batch/src/pagination/DescribeComputeEnvironmentsPaginator.ts
index 1fb6e07b2dbe..ebf44ae2b7c3 100644
--- a/clients/client-batch/src/pagination/DescribeComputeEnvironmentsPaginator.ts
+++ b/clients/client-batch/src/pagination/DescribeComputeEnvironmentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeComputeEnvironments(
       throw new Error("Invalid client, expected Batch | BatchClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-batch/src/pagination/DescribeJobDefinitionsPaginator.ts b/clients/client-batch/src/pagination/DescribeJobDefinitionsPaginator.ts
index e8c288c039f9..07bc9a2edc8b 100644
--- a/clients/client-batch/src/pagination/DescribeJobDefinitionsPaginator.ts
+++ b/clients/client-batch/src/pagination/DescribeJobDefinitionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeJobDefinitions(
       throw new Error("Invalid client, expected Batch | BatchClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-batch/src/pagination/DescribeJobQueuesPaginator.ts b/clients/client-batch/src/pagination/DescribeJobQueuesPaginator.ts
index 598684bdcffe..bb659a86dc1f 100644
--- a/clients/client-batch/src/pagination/DescribeJobQueuesPaginator.ts
+++ b/clients/client-batch/src/pagination/DescribeJobQueuesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeJobQueues(
       throw new Error("Invalid client, expected Batch | BatchClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-batch/src/pagination/ListJobsPaginator.ts b/clients/client-batch/src/pagination/ListJobsPaginator.ts
index 8b4f6153062c..0f43647f9b8e 100644
--- a/clients/client-batch/src/pagination/ListJobsPaginator.ts
+++ b/clients/client-batch/src/pagination/ListJobsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListJobs(
       throw new Error("Invalid client, expected Batch | BatchClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-batch/src/pagination/ListSchedulingPoliciesPaginator.ts b/clients/client-batch/src/pagination/ListSchedulingPoliciesPaginator.ts
index add610cc7a96..a66a98b2e2c4 100644
--- a/clients/client-batch/src/pagination/ListSchedulingPoliciesPaginator.ts
+++ b/clients/client-batch/src/pagination/ListSchedulingPoliciesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSchedulingPolicies(
       throw new Error("Invalid client, expected Batch | BatchClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-billingconductor/src/pagination/ListAccountAssociationsPaginator.ts b/clients/client-billingconductor/src/pagination/ListAccountAssociationsPaginator.ts
index 3dee4d32a7c2..817a14ab39ba 100644
--- a/clients/client-billingconductor/src/pagination/ListAccountAssociationsPaginator.ts
+++ b/clients/client-billingconductor/src/pagination/ListAccountAssociationsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListAccountAssociations(
       throw new Error("Invalid client, expected Billingconductor | BillingconductorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-billingconductor/src/pagination/ListBillingGroupCostReportsPaginator.ts b/clients/client-billingconductor/src/pagination/ListBillingGroupCostReportsPaginator.ts
index 84d9ed8646fc..534367a23977 100644
--- a/clients/client-billingconductor/src/pagination/ListBillingGroupCostReportsPaginator.ts
+++ b/clients/client-billingconductor/src/pagination/ListBillingGroupCostReportsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListBillingGroupCostReports(
       throw new Error("Invalid client, expected Billingconductor | BillingconductorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-billingconductor/src/pagination/ListBillingGroupsPaginator.ts b/clients/client-billingconductor/src/pagination/ListBillingGroupsPaginator.ts
index 2c9f8dac44df..c5799b7c25a6 100644
--- a/clients/client-billingconductor/src/pagination/ListBillingGroupsPaginator.ts
+++ b/clients/client-billingconductor/src/pagination/ListBillingGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListBillingGroups(
       throw new Error("Invalid client, expected Billingconductor | BillingconductorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-billingconductor/src/pagination/ListCustomLineItemsPaginator.ts b/clients/client-billingconductor/src/pagination/ListCustomLineItemsPaginator.ts
index 6c2856e39b74..d2302a726b76 100644
--- a/clients/client-billingconductor/src/pagination/ListCustomLineItemsPaginator.ts
+++ b/clients/client-billingconductor/src/pagination/ListCustomLineItemsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCustomLineItems(
       throw new Error("Invalid client, expected Billingconductor | BillingconductorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-billingconductor/src/pagination/ListPricingPlansAssociatedWithPricingRulePaginator.ts b/clients/client-billingconductor/src/pagination/ListPricingPlansAssociatedWithPricingRulePaginator.ts
index a173a8bd8ea0..876bff2aec20 100644
--- a/clients/client-billingconductor/src/pagination/ListPricingPlansAssociatedWithPricingRulePaginator.ts
+++ b/clients/client-billingconductor/src/pagination/ListPricingPlansAssociatedWithPricingRulePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPricingPlansAssociatedWithPricingRule(
       throw new Error("Invalid client, expected Billingconductor | BillingconductorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-billingconductor/src/pagination/ListPricingPlansPaginator.ts b/clients/client-billingconductor/src/pagination/ListPricingPlansPaginator.ts
index b8dffcae221a..4efb0c3ae201 100644
--- a/clients/client-billingconductor/src/pagination/ListPricingPlansPaginator.ts
+++ b/clients/client-billingconductor/src/pagination/ListPricingPlansPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPricingPlans(
       throw new Error("Invalid client, expected Billingconductor | BillingconductorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-billingconductor/src/pagination/ListPricingRulesAssociatedToPricingPlanPaginator.ts b/clients/client-billingconductor/src/pagination/ListPricingRulesAssociatedToPricingPlanPaginator.ts
index 9b9dd8f6506c..bdca044d4f15 100644
--- a/clients/client-billingconductor/src/pagination/ListPricingRulesAssociatedToPricingPlanPaginator.ts
+++ b/clients/client-billingconductor/src/pagination/ListPricingRulesAssociatedToPricingPlanPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPricingRulesAssociatedToPricingPlan(
       throw new Error("Invalid client, expected Billingconductor | BillingconductorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-billingconductor/src/pagination/ListPricingRulesPaginator.ts b/clients/client-billingconductor/src/pagination/ListPricingRulesPaginator.ts
index cde286d2aec8..50b72db984dc 100644
--- a/clients/client-billingconductor/src/pagination/ListPricingRulesPaginator.ts
+++ b/clients/client-billingconductor/src/pagination/ListPricingRulesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPricingRules(
       throw new Error("Invalid client, expected Billingconductor | BillingconductorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-billingconductor/src/pagination/ListResourcesAssociatedToCustomLineItemPaginator.ts b/clients/client-billingconductor/src/pagination/ListResourcesAssociatedToCustomLineItemPaginator.ts
index 425d0c0230ba..e3a2ab580d1b 100644
--- a/clients/client-billingconductor/src/pagination/ListResourcesAssociatedToCustomLineItemPaginator.ts
+++ b/clients/client-billingconductor/src/pagination/ListResourcesAssociatedToCustomLineItemPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListResourcesAssociatedToCustomLineItem(
       throw new Error("Invalid client, expected Billingconductor | BillingconductorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-braket/src/pagination/SearchDevicesPaginator.ts b/clients/client-braket/src/pagination/SearchDevicesPaginator.ts
index d0f6dbd6029d..853078c94332 100644
--- a/clients/client-braket/src/pagination/SearchDevicesPaginator.ts
+++ b/clients/client-braket/src/pagination/SearchDevicesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchDevices(
       throw new Error("Invalid client, expected Braket | BraketClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-braket/src/pagination/SearchJobsPaginator.ts b/clients/client-braket/src/pagination/SearchJobsPaginator.ts
index a2e0ea199c41..f7a36dbd03e3 100644
--- a/clients/client-braket/src/pagination/SearchJobsPaginator.ts
+++ b/clients/client-braket/src/pagination/SearchJobsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateSearchJobs(
       throw new Error("Invalid client, expected Braket | BraketClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-braket/src/pagination/SearchQuantumTasksPaginator.ts b/clients/client-braket/src/pagination/SearchQuantumTasksPaginator.ts
index ab282f61b025..fee89b98e481 100644
--- a/clients/client-braket/src/pagination/SearchQuantumTasksPaginator.ts
+++ b/clients/client-braket/src/pagination/SearchQuantumTasksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchQuantumTasks(
       throw new Error("Invalid client, expected Braket | BraketClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-budgets/src/pagination/DescribeBudgetActionHistoriesPaginator.ts b/clients/client-budgets/src/pagination/DescribeBudgetActionHistoriesPaginator.ts
index 61877bc6e618..1499162ea185 100644
--- a/clients/client-budgets/src/pagination/DescribeBudgetActionHistoriesPaginator.ts
+++ b/clients/client-budgets/src/pagination/DescribeBudgetActionHistoriesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeBudgetActionHistories(
       throw new Error("Invalid client, expected Budgets | BudgetsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-budgets/src/pagination/DescribeBudgetActionsForAccountPaginator.ts b/clients/client-budgets/src/pagination/DescribeBudgetActionsForAccountPaginator.ts
index 0982d307c2b0..08a65347319f 100644
--- a/clients/client-budgets/src/pagination/DescribeBudgetActionsForAccountPaginator.ts
+++ b/clients/client-budgets/src/pagination/DescribeBudgetActionsForAccountPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeBudgetActionsForAccount(
       throw new Error("Invalid client, expected Budgets | BudgetsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-budgets/src/pagination/DescribeBudgetActionsForBudgetPaginator.ts b/clients/client-budgets/src/pagination/DescribeBudgetActionsForBudgetPaginator.ts
index 5636f8d38983..5b2530ac54c1 100644
--- a/clients/client-budgets/src/pagination/DescribeBudgetActionsForBudgetPaginator.ts
+++ b/clients/client-budgets/src/pagination/DescribeBudgetActionsForBudgetPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeBudgetActionsForBudget(
       throw new Error("Invalid client, expected Budgets | BudgetsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-budgets/src/pagination/DescribeBudgetNotificationsForAccountPaginator.ts b/clients/client-budgets/src/pagination/DescribeBudgetNotificationsForAccountPaginator.ts
index ad977c5f9656..cf97ad12c045 100644
--- a/clients/client-budgets/src/pagination/DescribeBudgetNotificationsForAccountPaginator.ts
+++ b/clients/client-budgets/src/pagination/DescribeBudgetNotificationsForAccountPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeBudgetNotificationsForAccount(
       throw new Error("Invalid client, expected Budgets | BudgetsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-budgets/src/pagination/DescribeBudgetPerformanceHistoryPaginator.ts b/clients/client-budgets/src/pagination/DescribeBudgetPerformanceHistoryPaginator.ts
index 39d837ea7f76..fbeb3db395a5 100644
--- a/clients/client-budgets/src/pagination/DescribeBudgetPerformanceHistoryPaginator.ts
+++ b/clients/client-budgets/src/pagination/DescribeBudgetPerformanceHistoryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeBudgetPerformanceHistory(
       throw new Error("Invalid client, expected Budgets | BudgetsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-budgets/src/pagination/DescribeBudgetsPaginator.ts b/clients/client-budgets/src/pagination/DescribeBudgetsPaginator.ts
index 364f55e76741..750f113d45de 100644
--- a/clients/client-budgets/src/pagination/DescribeBudgetsPaginator.ts
+++ b/clients/client-budgets/src/pagination/DescribeBudgetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeBudgets(
       throw new Error("Invalid client, expected Budgets | BudgetsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-budgets/src/pagination/DescribeNotificationsForBudgetPaginator.ts b/clients/client-budgets/src/pagination/DescribeNotificationsForBudgetPaginator.ts
index 47e6663133eb..4241d55ba3ff 100644
--- a/clients/client-budgets/src/pagination/DescribeNotificationsForBudgetPaginator.ts
+++ b/clients/client-budgets/src/pagination/DescribeNotificationsForBudgetPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeNotificationsForBudget(
       throw new Error("Invalid client, expected Budgets | BudgetsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-budgets/src/pagination/DescribeSubscribersForNotificationPaginator.ts b/clients/client-budgets/src/pagination/DescribeSubscribersForNotificationPaginator.ts
index d92764a81753..652f3a432d96 100644
--- a/clients/client-budgets/src/pagination/DescribeSubscribersForNotificationPaginator.ts
+++ b/clients/client-budgets/src/pagination/DescribeSubscribersForNotificationPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeSubscribersForNotification(
       throw new Error("Invalid client, expected Budgets | BudgetsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime-sdk-identity/src/pagination/ListAppInstanceAdminsPaginator.ts b/clients/client-chime-sdk-identity/src/pagination/ListAppInstanceAdminsPaginator.ts
index 13e17adf9265..fc28963af989 100644
--- a/clients/client-chime-sdk-identity/src/pagination/ListAppInstanceAdminsPaginator.ts
+++ b/clients/client-chime-sdk-identity/src/pagination/ListAppInstanceAdminsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAppInstanceAdmins(
       throw new Error("Invalid client, expected ChimeSDKIdentity | ChimeSDKIdentityClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime-sdk-identity/src/pagination/ListAppInstanceUserEndpointsPaginator.ts b/clients/client-chime-sdk-identity/src/pagination/ListAppInstanceUserEndpointsPaginator.ts
index 17e1fd5fa75d..ae56561f1264 100644
--- a/clients/client-chime-sdk-identity/src/pagination/ListAppInstanceUserEndpointsPaginator.ts
+++ b/clients/client-chime-sdk-identity/src/pagination/ListAppInstanceUserEndpointsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAppInstanceUserEndpoints(
       throw new Error("Invalid client, expected ChimeSDKIdentity | ChimeSDKIdentityClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime-sdk-identity/src/pagination/ListAppInstanceUsersPaginator.ts b/clients/client-chime-sdk-identity/src/pagination/ListAppInstanceUsersPaginator.ts
index 464637107c0f..b98c75d3c968 100644
--- a/clients/client-chime-sdk-identity/src/pagination/ListAppInstanceUsersPaginator.ts
+++ b/clients/client-chime-sdk-identity/src/pagination/ListAppInstanceUsersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAppInstanceUsers(
       throw new Error("Invalid client, expected ChimeSDKIdentity | ChimeSDKIdentityClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime-sdk-identity/src/pagination/ListAppInstancesPaginator.ts b/clients/client-chime-sdk-identity/src/pagination/ListAppInstancesPaginator.ts
index a932969c0235..6d26a654f949 100644
--- a/clients/client-chime-sdk-identity/src/pagination/ListAppInstancesPaginator.ts
+++ b/clients/client-chime-sdk-identity/src/pagination/ListAppInstancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAppInstances(
       throw new Error("Invalid client, expected ChimeSDKIdentity | ChimeSDKIdentityClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime-sdk-meetings/src/pagination/ListAttendeesPaginator.ts b/clients/client-chime-sdk-meetings/src/pagination/ListAttendeesPaginator.ts
index ba0f449ae9fa..27b8944a685c 100644
--- a/clients/client-chime-sdk-meetings/src/pagination/ListAttendeesPaginator.ts
+++ b/clients/client-chime-sdk-meetings/src/pagination/ListAttendeesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAttendees(
       throw new Error("Invalid client, expected ChimeSDKMeetings | ChimeSDKMeetingsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime-sdk-messaging/src/pagination/ListChannelBansPaginator.ts b/clients/client-chime-sdk-messaging/src/pagination/ListChannelBansPaginator.ts
index 4f3ae7c43102..1210e7240ec5 100644
--- a/clients/client-chime-sdk-messaging/src/pagination/ListChannelBansPaginator.ts
+++ b/clients/client-chime-sdk-messaging/src/pagination/ListChannelBansPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListChannelBans(
       throw new Error("Invalid client, expected ChimeSDKMessaging | ChimeSDKMessagingClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime-sdk-messaging/src/pagination/ListChannelFlowsPaginator.ts b/clients/client-chime-sdk-messaging/src/pagination/ListChannelFlowsPaginator.ts
index 9e47a0d58244..fc05b7415f7d 100644
--- a/clients/client-chime-sdk-messaging/src/pagination/ListChannelFlowsPaginator.ts
+++ b/clients/client-chime-sdk-messaging/src/pagination/ListChannelFlowsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListChannelFlows(
       throw new Error("Invalid client, expected ChimeSDKMessaging | ChimeSDKMessagingClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime-sdk-messaging/src/pagination/ListChannelMembershipsForAppInstanceUserPaginator.ts b/clients/client-chime-sdk-messaging/src/pagination/ListChannelMembershipsForAppInstanceUserPaginator.ts
index 6172f788f031..5c14ad5797a8 100644
--- a/clients/client-chime-sdk-messaging/src/pagination/ListChannelMembershipsForAppInstanceUserPaginator.ts
+++ b/clients/client-chime-sdk-messaging/src/pagination/ListChannelMembershipsForAppInstanceUserPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListChannelMembershipsForAppInstanceUser(
       throw new Error("Invalid client, expected ChimeSDKMessaging | ChimeSDKMessagingClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime-sdk-messaging/src/pagination/ListChannelMembershipsPaginator.ts b/clients/client-chime-sdk-messaging/src/pagination/ListChannelMembershipsPaginator.ts
index 61bddb1f5850..7816aa9f69e4 100644
--- a/clients/client-chime-sdk-messaging/src/pagination/ListChannelMembershipsPaginator.ts
+++ b/clients/client-chime-sdk-messaging/src/pagination/ListChannelMembershipsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListChannelMemberships(
       throw new Error("Invalid client, expected ChimeSDKMessaging | ChimeSDKMessagingClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime-sdk-messaging/src/pagination/ListChannelMessagesPaginator.ts b/clients/client-chime-sdk-messaging/src/pagination/ListChannelMessagesPaginator.ts
index 63eb9170e48a..7e17ac42a617 100644
--- a/clients/client-chime-sdk-messaging/src/pagination/ListChannelMessagesPaginator.ts
+++ b/clients/client-chime-sdk-messaging/src/pagination/ListChannelMessagesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListChannelMessages(
       throw new Error("Invalid client, expected ChimeSDKMessaging | ChimeSDKMessagingClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime-sdk-messaging/src/pagination/ListChannelModeratorsPaginator.ts b/clients/client-chime-sdk-messaging/src/pagination/ListChannelModeratorsPaginator.ts
index 4306da2c682a..6967c23c5b01 100644
--- a/clients/client-chime-sdk-messaging/src/pagination/ListChannelModeratorsPaginator.ts
+++ b/clients/client-chime-sdk-messaging/src/pagination/ListChannelModeratorsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListChannelModerators(
       throw new Error("Invalid client, expected ChimeSDKMessaging | ChimeSDKMessagingClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime-sdk-messaging/src/pagination/ListChannelsAssociatedWithChannelFlowPaginator.ts b/clients/client-chime-sdk-messaging/src/pagination/ListChannelsAssociatedWithChannelFlowPaginator.ts
index 84a00a87f3a3..ef52a6b9cf7d 100644
--- a/clients/client-chime-sdk-messaging/src/pagination/ListChannelsAssociatedWithChannelFlowPaginator.ts
+++ b/clients/client-chime-sdk-messaging/src/pagination/ListChannelsAssociatedWithChannelFlowPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListChannelsAssociatedWithChannelFlow(
       throw new Error("Invalid client, expected ChimeSDKMessaging | ChimeSDKMessagingClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime-sdk-messaging/src/pagination/ListChannelsModeratedByAppInstanceUserPaginator.ts b/clients/client-chime-sdk-messaging/src/pagination/ListChannelsModeratedByAppInstanceUserPaginator.ts
index a7b9a7d2698b..5c9e124adcbd 100644
--- a/clients/client-chime-sdk-messaging/src/pagination/ListChannelsModeratedByAppInstanceUserPaginator.ts
+++ b/clients/client-chime-sdk-messaging/src/pagination/ListChannelsModeratedByAppInstanceUserPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListChannelsModeratedByAppInstanceUser(
       throw new Error("Invalid client, expected ChimeSDKMessaging | ChimeSDKMessagingClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime-sdk-messaging/src/pagination/ListChannelsPaginator.ts b/clients/client-chime-sdk-messaging/src/pagination/ListChannelsPaginator.ts
index a40755c467f1..ae049adaf394 100644
--- a/clients/client-chime-sdk-messaging/src/pagination/ListChannelsPaginator.ts
+++ b/clients/client-chime-sdk-messaging/src/pagination/ListChannelsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListChannels(
       throw new Error("Invalid client, expected ChimeSDKMessaging | ChimeSDKMessagingClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime/src/pagination/ListAccountsPaginator.ts b/clients/client-chime/src/pagination/ListAccountsPaginator.ts
index 4b62893afa69..b5985350faf6 100644
--- a/clients/client-chime/src/pagination/ListAccountsPaginator.ts
+++ b/clients/client-chime/src/pagination/ListAccountsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAccounts(
       throw new Error("Invalid client, expected Chime | ChimeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime/src/pagination/ListAppInstanceAdminsPaginator.ts b/clients/client-chime/src/pagination/ListAppInstanceAdminsPaginator.ts
index 1684c4c7a86f..97e08e94b5c3 100644
--- a/clients/client-chime/src/pagination/ListAppInstanceAdminsPaginator.ts
+++ b/clients/client-chime/src/pagination/ListAppInstanceAdminsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAppInstanceAdmins(
       throw new Error("Invalid client, expected Chime | ChimeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime/src/pagination/ListAppInstanceUsersPaginator.ts b/clients/client-chime/src/pagination/ListAppInstanceUsersPaginator.ts
index 2ead062b8329..b808a83414e4 100644
--- a/clients/client-chime/src/pagination/ListAppInstanceUsersPaginator.ts
+++ b/clients/client-chime/src/pagination/ListAppInstanceUsersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAppInstanceUsers(
       throw new Error("Invalid client, expected Chime | ChimeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime/src/pagination/ListAppInstancesPaginator.ts b/clients/client-chime/src/pagination/ListAppInstancesPaginator.ts
index 92d5b2015ea1..1d200cb728a3 100644
--- a/clients/client-chime/src/pagination/ListAppInstancesPaginator.ts
+++ b/clients/client-chime/src/pagination/ListAppInstancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAppInstances(
       throw new Error("Invalid client, expected Chime | ChimeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime/src/pagination/ListAttendeesPaginator.ts b/clients/client-chime/src/pagination/ListAttendeesPaginator.ts
index f54e2dafe62a..0f55a5728cc9 100644
--- a/clients/client-chime/src/pagination/ListAttendeesPaginator.ts
+++ b/clients/client-chime/src/pagination/ListAttendeesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAttendees(
       throw new Error("Invalid client, expected Chime | ChimeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime/src/pagination/ListBotsPaginator.ts b/clients/client-chime/src/pagination/ListBotsPaginator.ts
index 3c6210428809..77fb5d33b89e 100644
--- a/clients/client-chime/src/pagination/ListBotsPaginator.ts
+++ b/clients/client-chime/src/pagination/ListBotsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListBots(
       throw new Error("Invalid client, expected Chime | ChimeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime/src/pagination/ListChannelBansPaginator.ts b/clients/client-chime/src/pagination/ListChannelBansPaginator.ts
index 746cd6821842..144c51e6546d 100644
--- a/clients/client-chime/src/pagination/ListChannelBansPaginator.ts
+++ b/clients/client-chime/src/pagination/ListChannelBansPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListChannelBans(
       throw new Error("Invalid client, expected Chime | ChimeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime/src/pagination/ListChannelMembershipsForAppInstanceUserPaginator.ts b/clients/client-chime/src/pagination/ListChannelMembershipsForAppInstanceUserPaginator.ts
index 3a185b119937..e8679be08d2a 100644
--- a/clients/client-chime/src/pagination/ListChannelMembershipsForAppInstanceUserPaginator.ts
+++ b/clients/client-chime/src/pagination/ListChannelMembershipsForAppInstanceUserPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListChannelMembershipsForAppInstanceUser(
       throw new Error("Invalid client, expected Chime | ChimeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime/src/pagination/ListChannelMembershipsPaginator.ts b/clients/client-chime/src/pagination/ListChannelMembershipsPaginator.ts
index ef08ba751968..6d8b59c3a801 100644
--- a/clients/client-chime/src/pagination/ListChannelMembershipsPaginator.ts
+++ b/clients/client-chime/src/pagination/ListChannelMembershipsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListChannelMemberships(
       throw new Error("Invalid client, expected Chime | ChimeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime/src/pagination/ListChannelMessagesPaginator.ts b/clients/client-chime/src/pagination/ListChannelMessagesPaginator.ts
index f4e617dc03a3..c5c6b476dc7e 100644
--- a/clients/client-chime/src/pagination/ListChannelMessagesPaginator.ts
+++ b/clients/client-chime/src/pagination/ListChannelMessagesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListChannelMessages(
       throw new Error("Invalid client, expected Chime | ChimeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime/src/pagination/ListChannelModeratorsPaginator.ts b/clients/client-chime/src/pagination/ListChannelModeratorsPaginator.ts
index e103326f4601..f42d36ddae85 100644
--- a/clients/client-chime/src/pagination/ListChannelModeratorsPaginator.ts
+++ b/clients/client-chime/src/pagination/ListChannelModeratorsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListChannelModerators(
       throw new Error("Invalid client, expected Chime | ChimeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime/src/pagination/ListChannelsModeratedByAppInstanceUserPaginator.ts b/clients/client-chime/src/pagination/ListChannelsModeratedByAppInstanceUserPaginator.ts
index ac67b7cb199b..9f69e0a8bba8 100644
--- a/clients/client-chime/src/pagination/ListChannelsModeratedByAppInstanceUserPaginator.ts
+++ b/clients/client-chime/src/pagination/ListChannelsModeratedByAppInstanceUserPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListChannelsModeratedByAppInstanceUser(
       throw new Error("Invalid client, expected Chime | ChimeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime/src/pagination/ListChannelsPaginator.ts b/clients/client-chime/src/pagination/ListChannelsPaginator.ts
index c167e488ae32..702e864310a4 100644
--- a/clients/client-chime/src/pagination/ListChannelsPaginator.ts
+++ b/clients/client-chime/src/pagination/ListChannelsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListChannels(
       throw new Error("Invalid client, expected Chime | ChimeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime/src/pagination/ListMediaCapturePipelinesPaginator.ts b/clients/client-chime/src/pagination/ListMediaCapturePipelinesPaginator.ts
index 49d83929a6db..e18bed53554b 100644
--- a/clients/client-chime/src/pagination/ListMediaCapturePipelinesPaginator.ts
+++ b/clients/client-chime/src/pagination/ListMediaCapturePipelinesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListMediaCapturePipelines(
       throw new Error("Invalid client, expected Chime | ChimeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime/src/pagination/ListMeetingsPaginator.ts b/clients/client-chime/src/pagination/ListMeetingsPaginator.ts
index b56f8d628eff..f0270b321240 100644
--- a/clients/client-chime/src/pagination/ListMeetingsPaginator.ts
+++ b/clients/client-chime/src/pagination/ListMeetingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListMeetings(
       throw new Error("Invalid client, expected Chime | ChimeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime/src/pagination/ListPhoneNumberOrdersPaginator.ts b/clients/client-chime/src/pagination/ListPhoneNumberOrdersPaginator.ts
index faca08f6cfbc..c276337cd654 100644
--- a/clients/client-chime/src/pagination/ListPhoneNumberOrdersPaginator.ts
+++ b/clients/client-chime/src/pagination/ListPhoneNumberOrdersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPhoneNumberOrders(
       throw new Error("Invalid client, expected Chime | ChimeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime/src/pagination/ListPhoneNumbersPaginator.ts b/clients/client-chime/src/pagination/ListPhoneNumbersPaginator.ts
index f60037f9ee8d..932f7d541a75 100644
--- a/clients/client-chime/src/pagination/ListPhoneNumbersPaginator.ts
+++ b/clients/client-chime/src/pagination/ListPhoneNumbersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPhoneNumbers(
       throw new Error("Invalid client, expected Chime | ChimeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime/src/pagination/ListProxySessionsPaginator.ts b/clients/client-chime/src/pagination/ListProxySessionsPaginator.ts
index a8ea4ba9a0d6..f91d1874f15f 100644
--- a/clients/client-chime/src/pagination/ListProxySessionsPaginator.ts
+++ b/clients/client-chime/src/pagination/ListProxySessionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListProxySessions(
       throw new Error("Invalid client, expected Chime | ChimeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime/src/pagination/ListRoomMembershipsPaginator.ts b/clients/client-chime/src/pagination/ListRoomMembershipsPaginator.ts
index a857ae344d33..a92b31408633 100644
--- a/clients/client-chime/src/pagination/ListRoomMembershipsPaginator.ts
+++ b/clients/client-chime/src/pagination/ListRoomMembershipsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRoomMemberships(
       throw new Error("Invalid client, expected Chime | ChimeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime/src/pagination/ListRoomsPaginator.ts b/clients/client-chime/src/pagination/ListRoomsPaginator.ts
index 812ea0434705..681d49032195 100644
--- a/clients/client-chime/src/pagination/ListRoomsPaginator.ts
+++ b/clients/client-chime/src/pagination/ListRoomsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListRooms(
       throw new Error("Invalid client, expected Chime | ChimeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime/src/pagination/ListSipMediaApplicationsPaginator.ts b/clients/client-chime/src/pagination/ListSipMediaApplicationsPaginator.ts
index ae2a4089a7df..a28c86a46910 100644
--- a/clients/client-chime/src/pagination/ListSipMediaApplicationsPaginator.ts
+++ b/clients/client-chime/src/pagination/ListSipMediaApplicationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSipMediaApplications(
       throw new Error("Invalid client, expected Chime | ChimeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime/src/pagination/ListSipRulesPaginator.ts b/clients/client-chime/src/pagination/ListSipRulesPaginator.ts
index c920e2bd9d7e..3c0da17b010d 100644
--- a/clients/client-chime/src/pagination/ListSipRulesPaginator.ts
+++ b/clients/client-chime/src/pagination/ListSipRulesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSipRules(
       throw new Error("Invalid client, expected Chime | ChimeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime/src/pagination/ListUsersPaginator.ts b/clients/client-chime/src/pagination/ListUsersPaginator.ts
index 6c53922afc52..ac464cdbd8b1 100644
--- a/clients/client-chime/src/pagination/ListUsersPaginator.ts
+++ b/clients/client-chime/src/pagination/ListUsersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListUsers(
       throw new Error("Invalid client, expected Chime | ChimeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime/src/pagination/ListVoiceConnectorGroupsPaginator.ts b/clients/client-chime/src/pagination/ListVoiceConnectorGroupsPaginator.ts
index bef55fc0bf1c..1a7183fc901a 100644
--- a/clients/client-chime/src/pagination/ListVoiceConnectorGroupsPaginator.ts
+++ b/clients/client-chime/src/pagination/ListVoiceConnectorGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListVoiceConnectorGroups(
       throw new Error("Invalid client, expected Chime | ChimeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime/src/pagination/ListVoiceConnectorsPaginator.ts b/clients/client-chime/src/pagination/ListVoiceConnectorsPaginator.ts
index 980bde648e62..5795b048fe32 100644
--- a/clients/client-chime/src/pagination/ListVoiceConnectorsPaginator.ts
+++ b/clients/client-chime/src/pagination/ListVoiceConnectorsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListVoiceConnectors(
       throw new Error("Invalid client, expected Chime | ChimeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-chime/src/pagination/SearchAvailablePhoneNumbersPaginator.ts b/clients/client-chime/src/pagination/SearchAvailablePhoneNumbersPaginator.ts
index a7e7d0df1ffe..35602df06e3b 100644
--- a/clients/client-chime/src/pagination/SearchAvailablePhoneNumbersPaginator.ts
+++ b/clients/client-chime/src/pagination/SearchAvailablePhoneNumbersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchAvailablePhoneNumbers(
       throw new Error("Invalid client, expected Chime | ChimeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloud9/src/pagination/DescribeEnvironmentMembershipsPaginator.ts b/clients/client-cloud9/src/pagination/DescribeEnvironmentMembershipsPaginator.ts
index 1b9d3f46e16b..e8416f18af05 100644
--- a/clients/client-cloud9/src/pagination/DescribeEnvironmentMembershipsPaginator.ts
+++ b/clients/client-cloud9/src/pagination/DescribeEnvironmentMembershipsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEnvironmentMemberships(
       throw new Error("Invalid client, expected Cloud9 | Cloud9Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloud9/src/pagination/ListEnvironmentsPaginator.ts b/clients/client-cloud9/src/pagination/ListEnvironmentsPaginator.ts
index 19f70acb0b09..b7c1503fc631 100644
--- a/clients/client-cloud9/src/pagination/ListEnvironmentsPaginator.ts
+++ b/clients/client-cloud9/src/pagination/ListEnvironmentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEnvironments(
       throw new Error("Invalid client, expected Cloud9 | Cloud9Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudcontrol/src/pagination/ListResourceRequestsPaginator.ts b/clients/client-cloudcontrol/src/pagination/ListResourceRequestsPaginator.ts
index 78f3b70583c7..35ea8cadedb4 100644
--- a/clients/client-cloudcontrol/src/pagination/ListResourceRequestsPaginator.ts
+++ b/clients/client-cloudcontrol/src/pagination/ListResourceRequestsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListResourceRequests(
       throw new Error("Invalid client, expected CloudControl | CloudControlClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudcontrol/src/pagination/ListResourcesPaginator.ts b/clients/client-cloudcontrol/src/pagination/ListResourcesPaginator.ts
index 6b11a54235f9..ba9690cc9d5a 100644
--- a/clients/client-cloudcontrol/src/pagination/ListResourcesPaginator.ts
+++ b/clients/client-cloudcontrol/src/pagination/ListResourcesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListResources(
       throw new Error("Invalid client, expected CloudControl | CloudControlClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-clouddirectory/src/pagination/ListAppliedSchemaArnsPaginator.ts b/clients/client-clouddirectory/src/pagination/ListAppliedSchemaArnsPaginator.ts
index cee06a38a44e..d3245c31566e 100644
--- a/clients/client-clouddirectory/src/pagination/ListAppliedSchemaArnsPaginator.ts
+++ b/clients/client-clouddirectory/src/pagination/ListAppliedSchemaArnsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAppliedSchemaArns(
       throw new Error("Invalid client, expected CloudDirectory | CloudDirectoryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-clouddirectory/src/pagination/ListAttachedIndicesPaginator.ts b/clients/client-clouddirectory/src/pagination/ListAttachedIndicesPaginator.ts
index a90596460d79..27a82305f305 100644
--- a/clients/client-clouddirectory/src/pagination/ListAttachedIndicesPaginator.ts
+++ b/clients/client-clouddirectory/src/pagination/ListAttachedIndicesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAttachedIndices(
       throw new Error("Invalid client, expected CloudDirectory | CloudDirectoryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-clouddirectory/src/pagination/ListDevelopmentSchemaArnsPaginator.ts b/clients/client-clouddirectory/src/pagination/ListDevelopmentSchemaArnsPaginator.ts
index b155c69dc319..aab9d6103079 100644
--- a/clients/client-clouddirectory/src/pagination/ListDevelopmentSchemaArnsPaginator.ts
+++ b/clients/client-clouddirectory/src/pagination/ListDevelopmentSchemaArnsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDevelopmentSchemaArns(
       throw new Error("Invalid client, expected CloudDirectory | CloudDirectoryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-clouddirectory/src/pagination/ListDirectoriesPaginator.ts b/clients/client-clouddirectory/src/pagination/ListDirectoriesPaginator.ts
index a51e030b1070..b6c7d331fafe 100644
--- a/clients/client-clouddirectory/src/pagination/ListDirectoriesPaginator.ts
+++ b/clients/client-clouddirectory/src/pagination/ListDirectoriesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDirectories(
       throw new Error("Invalid client, expected CloudDirectory | CloudDirectoryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-clouddirectory/src/pagination/ListFacetAttributesPaginator.ts b/clients/client-clouddirectory/src/pagination/ListFacetAttributesPaginator.ts
index 108d2611af53..841cbfe09185 100644
--- a/clients/client-clouddirectory/src/pagination/ListFacetAttributesPaginator.ts
+++ b/clients/client-clouddirectory/src/pagination/ListFacetAttributesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFacetAttributes(
       throw new Error("Invalid client, expected CloudDirectory | CloudDirectoryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-clouddirectory/src/pagination/ListFacetNamesPaginator.ts b/clients/client-clouddirectory/src/pagination/ListFacetNamesPaginator.ts
index 1efbc912739b..d365809fec57 100644
--- a/clients/client-clouddirectory/src/pagination/ListFacetNamesPaginator.ts
+++ b/clients/client-clouddirectory/src/pagination/ListFacetNamesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFacetNames(
       throw new Error("Invalid client, expected CloudDirectory | CloudDirectoryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-clouddirectory/src/pagination/ListIndexPaginator.ts b/clients/client-clouddirectory/src/pagination/ListIndexPaginator.ts
index a51997ce841e..3101b8537b08 100644
--- a/clients/client-clouddirectory/src/pagination/ListIndexPaginator.ts
+++ b/clients/client-clouddirectory/src/pagination/ListIndexPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListIndex(
       throw new Error("Invalid client, expected CloudDirectory | CloudDirectoryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-clouddirectory/src/pagination/ListManagedSchemaArnsPaginator.ts b/clients/client-clouddirectory/src/pagination/ListManagedSchemaArnsPaginator.ts
index 658aee8b72ad..b0333b12b560 100644
--- a/clients/client-clouddirectory/src/pagination/ListManagedSchemaArnsPaginator.ts
+++ b/clients/client-clouddirectory/src/pagination/ListManagedSchemaArnsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListManagedSchemaArns(
       throw new Error("Invalid client, expected CloudDirectory | CloudDirectoryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-clouddirectory/src/pagination/ListObjectAttributesPaginator.ts b/clients/client-clouddirectory/src/pagination/ListObjectAttributesPaginator.ts
index 80f774b784b6..3213acc211dc 100644
--- a/clients/client-clouddirectory/src/pagination/ListObjectAttributesPaginator.ts
+++ b/clients/client-clouddirectory/src/pagination/ListObjectAttributesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListObjectAttributes(
       throw new Error("Invalid client, expected CloudDirectory | CloudDirectoryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-clouddirectory/src/pagination/ListObjectChildrenPaginator.ts b/clients/client-clouddirectory/src/pagination/ListObjectChildrenPaginator.ts
index e8cfed0dcc6c..185a8b88e963 100644
--- a/clients/client-clouddirectory/src/pagination/ListObjectChildrenPaginator.ts
+++ b/clients/client-clouddirectory/src/pagination/ListObjectChildrenPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListObjectChildren(
       throw new Error("Invalid client, expected CloudDirectory | CloudDirectoryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-clouddirectory/src/pagination/ListObjectParentPathsPaginator.ts b/clients/client-clouddirectory/src/pagination/ListObjectParentPathsPaginator.ts
index 5f0d1a46db56..b8ed1ce1afcf 100644
--- a/clients/client-clouddirectory/src/pagination/ListObjectParentPathsPaginator.ts
+++ b/clients/client-clouddirectory/src/pagination/ListObjectParentPathsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListObjectParentPaths(
       throw new Error("Invalid client, expected CloudDirectory | CloudDirectoryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-clouddirectory/src/pagination/ListObjectParentsPaginator.ts b/clients/client-clouddirectory/src/pagination/ListObjectParentsPaginator.ts
index 8b51ca18e488..1a21d71fd440 100644
--- a/clients/client-clouddirectory/src/pagination/ListObjectParentsPaginator.ts
+++ b/clients/client-clouddirectory/src/pagination/ListObjectParentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListObjectParents(
       throw new Error("Invalid client, expected CloudDirectory | CloudDirectoryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-clouddirectory/src/pagination/ListObjectPoliciesPaginator.ts b/clients/client-clouddirectory/src/pagination/ListObjectPoliciesPaginator.ts
index 272036a44c33..2ec9ff689bc3 100644
--- a/clients/client-clouddirectory/src/pagination/ListObjectPoliciesPaginator.ts
+++ b/clients/client-clouddirectory/src/pagination/ListObjectPoliciesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListObjectPolicies(
       throw new Error("Invalid client, expected CloudDirectory | CloudDirectoryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-clouddirectory/src/pagination/ListPolicyAttachmentsPaginator.ts b/clients/client-clouddirectory/src/pagination/ListPolicyAttachmentsPaginator.ts
index b8362772cd68..6a27a948c1bb 100644
--- a/clients/client-clouddirectory/src/pagination/ListPolicyAttachmentsPaginator.ts
+++ b/clients/client-clouddirectory/src/pagination/ListPolicyAttachmentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPolicyAttachments(
       throw new Error("Invalid client, expected CloudDirectory | CloudDirectoryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-clouddirectory/src/pagination/ListPublishedSchemaArnsPaginator.ts b/clients/client-clouddirectory/src/pagination/ListPublishedSchemaArnsPaginator.ts
index f179bea82727..f279a2b6645e 100644
--- a/clients/client-clouddirectory/src/pagination/ListPublishedSchemaArnsPaginator.ts
+++ b/clients/client-clouddirectory/src/pagination/ListPublishedSchemaArnsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPublishedSchemaArns(
       throw new Error("Invalid client, expected CloudDirectory | CloudDirectoryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-clouddirectory/src/pagination/ListTagsForResourcePaginator.ts b/clients/client-clouddirectory/src/pagination/ListTagsForResourcePaginator.ts
index 76cdb7b6a9a2..30cd1787989c 100644
--- a/clients/client-clouddirectory/src/pagination/ListTagsForResourcePaginator.ts
+++ b/clients/client-clouddirectory/src/pagination/ListTagsForResourcePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTagsForResource(
       throw new Error("Invalid client, expected CloudDirectory | CloudDirectoryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-clouddirectory/src/pagination/ListTypedLinkFacetAttributesPaginator.ts b/clients/client-clouddirectory/src/pagination/ListTypedLinkFacetAttributesPaginator.ts
index 2bc3e4e1bfc2..763470c79799 100644
--- a/clients/client-clouddirectory/src/pagination/ListTypedLinkFacetAttributesPaginator.ts
+++ b/clients/client-clouddirectory/src/pagination/ListTypedLinkFacetAttributesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTypedLinkFacetAttributes(
       throw new Error("Invalid client, expected CloudDirectory | CloudDirectoryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-clouddirectory/src/pagination/ListTypedLinkFacetNamesPaginator.ts b/clients/client-clouddirectory/src/pagination/ListTypedLinkFacetNamesPaginator.ts
index d7e7684a2c59..d3d38225d242 100644
--- a/clients/client-clouddirectory/src/pagination/ListTypedLinkFacetNamesPaginator.ts
+++ b/clients/client-clouddirectory/src/pagination/ListTypedLinkFacetNamesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTypedLinkFacetNames(
       throw new Error("Invalid client, expected CloudDirectory | CloudDirectoryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-clouddirectory/src/pagination/LookupPolicyPaginator.ts b/clients/client-clouddirectory/src/pagination/LookupPolicyPaginator.ts
index 1f575bd05e91..1bca60cf87bd 100644
--- a/clients/client-clouddirectory/src/pagination/LookupPolicyPaginator.ts
+++ b/clients/client-clouddirectory/src/pagination/LookupPolicyPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateLookupPolicy(
       throw new Error("Invalid client, expected CloudDirectory | CloudDirectoryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudformation/src/pagination/DescribeAccountLimitsPaginator.ts b/clients/client-cloudformation/src/pagination/DescribeAccountLimitsPaginator.ts
index 0b7d0af02102..3e7f5d7ad2ba 100644
--- a/clients/client-cloudformation/src/pagination/DescribeAccountLimitsPaginator.ts
+++ b/clients/client-cloudformation/src/pagination/DescribeAccountLimitsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateDescribeAccountLimits(
       throw new Error("Invalid client, expected CloudFormation | CloudFormationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudformation/src/pagination/DescribeStackEventsPaginator.ts b/clients/client-cloudformation/src/pagination/DescribeStackEventsPaginator.ts
index f2b4b222e0b3..0eaf823c4bb2 100644
--- a/clients/client-cloudformation/src/pagination/DescribeStackEventsPaginator.ts
+++ b/clients/client-cloudformation/src/pagination/DescribeStackEventsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateDescribeStackEvents(
       throw new Error("Invalid client, expected CloudFormation | CloudFormationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudformation/src/pagination/DescribeStackResourceDriftsPaginator.ts b/clients/client-cloudformation/src/pagination/DescribeStackResourceDriftsPaginator.ts
index 437eef414bb9..eada130b21e8 100644
--- a/clients/client-cloudformation/src/pagination/DescribeStackResourceDriftsPaginator.ts
+++ b/clients/client-cloudformation/src/pagination/DescribeStackResourceDriftsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeStackResourceDrifts(
       throw new Error("Invalid client, expected CloudFormation | CloudFormationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudformation/src/pagination/DescribeStacksPaginator.ts b/clients/client-cloudformation/src/pagination/DescribeStacksPaginator.ts
index 3f9092d0a5a0..1df59522ef4e 100644
--- a/clients/client-cloudformation/src/pagination/DescribeStacksPaginator.ts
+++ b/clients/client-cloudformation/src/pagination/DescribeStacksPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateDescribeStacks(
       throw new Error("Invalid client, expected CloudFormation | CloudFormationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudformation/src/pagination/ListChangeSetsPaginator.ts b/clients/client-cloudformation/src/pagination/ListChangeSetsPaginator.ts
index 15407b5e1584..63cfad130595 100644
--- a/clients/client-cloudformation/src/pagination/ListChangeSetsPaginator.ts
+++ b/clients/client-cloudformation/src/pagination/ListChangeSetsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListChangeSets(
       throw new Error("Invalid client, expected CloudFormation | CloudFormationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudformation/src/pagination/ListExportsPaginator.ts b/clients/client-cloudformation/src/pagination/ListExportsPaginator.ts
index 68933983628f..902591f54c4c 100644
--- a/clients/client-cloudformation/src/pagination/ListExportsPaginator.ts
+++ b/clients/client-cloudformation/src/pagination/ListExportsPaginator.ts
@@ -46,8 +46,9 @@ export async function* paginateListExports(
       throw new Error("Invalid client, expected CloudFormation | CloudFormationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudformation/src/pagination/ListImportsPaginator.ts b/clients/client-cloudformation/src/pagination/ListImportsPaginator.ts
index dba278c69ed6..5ba5643cc7c6 100644
--- a/clients/client-cloudformation/src/pagination/ListImportsPaginator.ts
+++ b/clients/client-cloudformation/src/pagination/ListImportsPaginator.ts
@@ -46,8 +46,9 @@ export async function* paginateListImports(
       throw new Error("Invalid client, expected CloudFormation | CloudFormationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudformation/src/pagination/ListStackInstancesPaginator.ts b/clients/client-cloudformation/src/pagination/ListStackInstancesPaginator.ts
index addee4eafd5f..8fe84df782bb 100644
--- a/clients/client-cloudformation/src/pagination/ListStackInstancesPaginator.ts
+++ b/clients/client-cloudformation/src/pagination/ListStackInstancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListStackInstances(
       throw new Error("Invalid client, expected CloudFormation | CloudFormationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudformation/src/pagination/ListStackResourcesPaginator.ts b/clients/client-cloudformation/src/pagination/ListStackResourcesPaginator.ts
index 78358cff2d09..dadb54cd4ded 100644
--- a/clients/client-cloudformation/src/pagination/ListStackResourcesPaginator.ts
+++ b/clients/client-cloudformation/src/pagination/ListStackResourcesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListStackResources(
       throw new Error("Invalid client, expected CloudFormation | CloudFormationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudformation/src/pagination/ListStackSetOperationResultsPaginator.ts b/clients/client-cloudformation/src/pagination/ListStackSetOperationResultsPaginator.ts
index 4b1f532fedd8..97901d35609d 100644
--- a/clients/client-cloudformation/src/pagination/ListStackSetOperationResultsPaginator.ts
+++ b/clients/client-cloudformation/src/pagination/ListStackSetOperationResultsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListStackSetOperationResults(
       throw new Error("Invalid client, expected CloudFormation | CloudFormationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudformation/src/pagination/ListStackSetOperationsPaginator.ts b/clients/client-cloudformation/src/pagination/ListStackSetOperationsPaginator.ts
index 812062074274..bea2aab34fc1 100644
--- a/clients/client-cloudformation/src/pagination/ListStackSetOperationsPaginator.ts
+++ b/clients/client-cloudformation/src/pagination/ListStackSetOperationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListStackSetOperations(
       throw new Error("Invalid client, expected CloudFormation | CloudFormationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudformation/src/pagination/ListStackSetsPaginator.ts b/clients/client-cloudformation/src/pagination/ListStackSetsPaginator.ts
index 3bbdf9e40f3d..3695ebef2697 100644
--- a/clients/client-cloudformation/src/pagination/ListStackSetsPaginator.ts
+++ b/clients/client-cloudformation/src/pagination/ListStackSetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListStackSets(
       throw new Error("Invalid client, expected CloudFormation | CloudFormationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudformation/src/pagination/ListStacksPaginator.ts b/clients/client-cloudformation/src/pagination/ListStacksPaginator.ts
index 3575574dbdaa..0f1d56ed700d 100644
--- a/clients/client-cloudformation/src/pagination/ListStacksPaginator.ts
+++ b/clients/client-cloudformation/src/pagination/ListStacksPaginator.ts
@@ -46,8 +46,9 @@ export async function* paginateListStacks(
       throw new Error("Invalid client, expected CloudFormation | CloudFormationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudformation/src/pagination/ListTypeRegistrationsPaginator.ts b/clients/client-cloudformation/src/pagination/ListTypeRegistrationsPaginator.ts
index d2910bfcf7d5..3cdd52a6ca77 100644
--- a/clients/client-cloudformation/src/pagination/ListTypeRegistrationsPaginator.ts
+++ b/clients/client-cloudformation/src/pagination/ListTypeRegistrationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTypeRegistrations(
       throw new Error("Invalid client, expected CloudFormation | CloudFormationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudformation/src/pagination/ListTypeVersionsPaginator.ts b/clients/client-cloudformation/src/pagination/ListTypeVersionsPaginator.ts
index 9e0842099ba2..4bc71a0eec50 100644
--- a/clients/client-cloudformation/src/pagination/ListTypeVersionsPaginator.ts
+++ b/clients/client-cloudformation/src/pagination/ListTypeVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTypeVersions(
       throw new Error("Invalid client, expected CloudFormation | CloudFormationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudformation/src/pagination/ListTypesPaginator.ts b/clients/client-cloudformation/src/pagination/ListTypesPaginator.ts
index 1d7f80e11ed3..61be0dbbaec8 100644
--- a/clients/client-cloudformation/src/pagination/ListTypesPaginator.ts
+++ b/clients/client-cloudformation/src/pagination/ListTypesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListTypes(
       throw new Error("Invalid client, expected CloudFormation | CloudFormationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudfront/src/pagination/ListCloudFrontOriginAccessIdentitiesPaginator.ts b/clients/client-cloudfront/src/pagination/ListCloudFrontOriginAccessIdentitiesPaginator.ts
index dfaad5814765..85b2e7f8664c 100644
--- a/clients/client-cloudfront/src/pagination/ListCloudFrontOriginAccessIdentitiesPaginator.ts
+++ b/clients/client-cloudfront/src/pagination/ListCloudFrontOriginAccessIdentitiesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCloudFrontOriginAccessIdentities(
       throw new Error("Invalid client, expected CloudFront | CloudFrontClient");
     }
     yield page;
+    const prevToken = token;
     token = page.CloudFrontOriginAccessIdentityList!.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudfront/src/pagination/ListDistributionsPaginator.ts b/clients/client-cloudfront/src/pagination/ListDistributionsPaginator.ts
index b320b8b4c732..314fad88d0ac 100644
--- a/clients/client-cloudfront/src/pagination/ListDistributionsPaginator.ts
+++ b/clients/client-cloudfront/src/pagination/ListDistributionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDistributions(
       throw new Error("Invalid client, expected CloudFront | CloudFrontClient");
     }
     yield page;
+    const prevToken = token;
     token = page.DistributionList!.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudfront/src/pagination/ListInvalidationsPaginator.ts b/clients/client-cloudfront/src/pagination/ListInvalidationsPaginator.ts
index b5a7c40d6802..cdcea59b5362 100644
--- a/clients/client-cloudfront/src/pagination/ListInvalidationsPaginator.ts
+++ b/clients/client-cloudfront/src/pagination/ListInvalidationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListInvalidations(
       throw new Error("Invalid client, expected CloudFront | CloudFrontClient");
     }
     yield page;
+    const prevToken = token;
     token = page.InvalidationList!.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudfront/src/pagination/ListStreamingDistributionsPaginator.ts b/clients/client-cloudfront/src/pagination/ListStreamingDistributionsPaginator.ts
index a058f857de0e..df273847a867 100644
--- a/clients/client-cloudfront/src/pagination/ListStreamingDistributionsPaginator.ts
+++ b/clients/client-cloudfront/src/pagination/ListStreamingDistributionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListStreamingDistributions(
       throw new Error("Invalid client, expected CloudFront | CloudFrontClient");
     }
     yield page;
+    const prevToken = token;
     token = page.StreamingDistributionList!.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudhsm-v2/src/pagination/DescribeBackupsPaginator.ts b/clients/client-cloudhsm-v2/src/pagination/DescribeBackupsPaginator.ts
index 01ddc6838793..075c8a382615 100644
--- a/clients/client-cloudhsm-v2/src/pagination/DescribeBackupsPaginator.ts
+++ b/clients/client-cloudhsm-v2/src/pagination/DescribeBackupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeBackups(
       throw new Error("Invalid client, expected CloudHSMV2 | CloudHSMV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudhsm-v2/src/pagination/DescribeClustersPaginator.ts b/clients/client-cloudhsm-v2/src/pagination/DescribeClustersPaginator.ts
index 44c2389c3e23..2d82afc761ec 100644
--- a/clients/client-cloudhsm-v2/src/pagination/DescribeClustersPaginator.ts
+++ b/clients/client-cloudhsm-v2/src/pagination/DescribeClustersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeClusters(
       throw new Error("Invalid client, expected CloudHSMV2 | CloudHSMV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudhsm-v2/src/pagination/ListTagsPaginator.ts b/clients/client-cloudhsm-v2/src/pagination/ListTagsPaginator.ts
index 7e07fed037d6..b3d629520c0b 100644
--- a/clients/client-cloudhsm-v2/src/pagination/ListTagsPaginator.ts
+++ b/clients/client-cloudhsm-v2/src/pagination/ListTagsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListTags(
       throw new Error("Invalid client, expected CloudHSMV2 | CloudHSMV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudtrail/src/pagination/GetQueryResultsPaginator.ts b/clients/client-cloudtrail/src/pagination/GetQueryResultsPaginator.ts
index 75c844e2901a..526f9226fdcb 100644
--- a/clients/client-cloudtrail/src/pagination/GetQueryResultsPaginator.ts
+++ b/clients/client-cloudtrail/src/pagination/GetQueryResultsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateGetQueryResults(
       throw new Error("Invalid client, expected CloudTrail | CloudTrailClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudtrail/src/pagination/ListEventDataStoresPaginator.ts b/clients/client-cloudtrail/src/pagination/ListEventDataStoresPaginator.ts
index 9ddbed107f9c..384cd128a056 100644
--- a/clients/client-cloudtrail/src/pagination/ListEventDataStoresPaginator.ts
+++ b/clients/client-cloudtrail/src/pagination/ListEventDataStoresPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEventDataStores(
       throw new Error("Invalid client, expected CloudTrail | CloudTrailClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudtrail/src/pagination/ListPublicKeysPaginator.ts b/clients/client-cloudtrail/src/pagination/ListPublicKeysPaginator.ts
index 816174e6fb4a..c8b4c4c055dd 100644
--- a/clients/client-cloudtrail/src/pagination/ListPublicKeysPaginator.ts
+++ b/clients/client-cloudtrail/src/pagination/ListPublicKeysPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListPublicKeys(
       throw new Error("Invalid client, expected CloudTrail | CloudTrailClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudtrail/src/pagination/ListQueriesPaginator.ts b/clients/client-cloudtrail/src/pagination/ListQueriesPaginator.ts
index 1233929e1d16..aff02b5fca63 100644
--- a/clients/client-cloudtrail/src/pagination/ListQueriesPaginator.ts
+++ b/clients/client-cloudtrail/src/pagination/ListQueriesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListQueries(
       throw new Error("Invalid client, expected CloudTrail | CloudTrailClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudtrail/src/pagination/ListTagsPaginator.ts b/clients/client-cloudtrail/src/pagination/ListTagsPaginator.ts
index 7f43af902592..813cf3f04dd9 100644
--- a/clients/client-cloudtrail/src/pagination/ListTagsPaginator.ts
+++ b/clients/client-cloudtrail/src/pagination/ListTagsPaginator.ts
@@ -46,8 +46,9 @@ export async function* paginateListTags(
       throw new Error("Invalid client, expected CloudTrail | CloudTrailClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudtrail/src/pagination/ListTrailsPaginator.ts b/clients/client-cloudtrail/src/pagination/ListTrailsPaginator.ts
index 14a7fbb9451e..662d1eba2922 100644
--- a/clients/client-cloudtrail/src/pagination/ListTrailsPaginator.ts
+++ b/clients/client-cloudtrail/src/pagination/ListTrailsPaginator.ts
@@ -46,8 +46,9 @@ export async function* paginateListTrails(
       throw new Error("Invalid client, expected CloudTrail | CloudTrailClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudtrail/src/pagination/LookupEventsPaginator.ts b/clients/client-cloudtrail/src/pagination/LookupEventsPaginator.ts
index ea2017ed9b39..40aec1a892f8 100644
--- a/clients/client-cloudtrail/src/pagination/LookupEventsPaginator.ts
+++ b/clients/client-cloudtrail/src/pagination/LookupEventsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateLookupEvents(
       throw new Error("Invalid client, expected CloudTrail | CloudTrailClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudwatch-logs/src/pagination/DescribeDestinationsPaginator.ts b/clients/client-cloudwatch-logs/src/pagination/DescribeDestinationsPaginator.ts
index f84041b2c984..ffecd2c38a1a 100644
--- a/clients/client-cloudwatch-logs/src/pagination/DescribeDestinationsPaginator.ts
+++ b/clients/client-cloudwatch-logs/src/pagination/DescribeDestinationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDestinations(
       throw new Error("Invalid client, expected CloudWatchLogs | CloudWatchLogsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudwatch-logs/src/pagination/DescribeLogGroupsPaginator.ts b/clients/client-cloudwatch-logs/src/pagination/DescribeLogGroupsPaginator.ts
index e380ed8a1776..71d61b1a78fd 100644
--- a/clients/client-cloudwatch-logs/src/pagination/DescribeLogGroupsPaginator.ts
+++ b/clients/client-cloudwatch-logs/src/pagination/DescribeLogGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeLogGroups(
       throw new Error("Invalid client, expected CloudWatchLogs | CloudWatchLogsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudwatch-logs/src/pagination/DescribeLogStreamsPaginator.ts b/clients/client-cloudwatch-logs/src/pagination/DescribeLogStreamsPaginator.ts
index bdaceaa2afa4..c20557d2e006 100644
--- a/clients/client-cloudwatch-logs/src/pagination/DescribeLogStreamsPaginator.ts
+++ b/clients/client-cloudwatch-logs/src/pagination/DescribeLogStreamsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeLogStreams(
       throw new Error("Invalid client, expected CloudWatchLogs | CloudWatchLogsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudwatch-logs/src/pagination/DescribeMetricFiltersPaginator.ts b/clients/client-cloudwatch-logs/src/pagination/DescribeMetricFiltersPaginator.ts
index 7caad35a8118..a10ec36a6718 100644
--- a/clients/client-cloudwatch-logs/src/pagination/DescribeMetricFiltersPaginator.ts
+++ b/clients/client-cloudwatch-logs/src/pagination/DescribeMetricFiltersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeMetricFilters(
       throw new Error("Invalid client, expected CloudWatchLogs | CloudWatchLogsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudwatch-logs/src/pagination/DescribeSubscriptionFiltersPaginator.ts b/clients/client-cloudwatch-logs/src/pagination/DescribeSubscriptionFiltersPaginator.ts
index b6ce416d0a17..5fa168a01aeb 100644
--- a/clients/client-cloudwatch-logs/src/pagination/DescribeSubscriptionFiltersPaginator.ts
+++ b/clients/client-cloudwatch-logs/src/pagination/DescribeSubscriptionFiltersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeSubscriptionFilters(
       throw new Error("Invalid client, expected CloudWatchLogs | CloudWatchLogsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudwatch-logs/src/pagination/FilterLogEventsPaginator.ts b/clients/client-cloudwatch-logs/src/pagination/FilterLogEventsPaginator.ts
index 70f5bed24e1f..87ebc1979922 100644
--- a/clients/client-cloudwatch-logs/src/pagination/FilterLogEventsPaginator.ts
+++ b/clients/client-cloudwatch-logs/src/pagination/FilterLogEventsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateFilterLogEvents(
       throw new Error("Invalid client, expected CloudWatchLogs | CloudWatchLogsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudwatch-logs/src/pagination/GetLogEventsPaginator.ts b/clients/client-cloudwatch-logs/src/pagination/GetLogEventsPaginator.ts
index d3632346bab6..12491e2c9acd 100644
--- a/clients/client-cloudwatch-logs/src/pagination/GetLogEventsPaginator.ts
+++ b/clients/client-cloudwatch-logs/src/pagination/GetLogEventsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetLogEvents(
       throw new Error("Invalid client, expected CloudWatchLogs | CloudWatchLogsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextForwardToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudwatch/src/pagination/DescribeAlarmHistoryPaginator.ts b/clients/client-cloudwatch/src/pagination/DescribeAlarmHistoryPaginator.ts
index c30166e6b3b4..227673415c83 100644
--- a/clients/client-cloudwatch/src/pagination/DescribeAlarmHistoryPaginator.ts
+++ b/clients/client-cloudwatch/src/pagination/DescribeAlarmHistoryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeAlarmHistory(
       throw new Error("Invalid client, expected CloudWatch | CloudWatchClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudwatch/src/pagination/DescribeAlarmsPaginator.ts b/clients/client-cloudwatch/src/pagination/DescribeAlarmsPaginator.ts
index 73ff85a2fac4..cc4dca321c3d 100644
--- a/clients/client-cloudwatch/src/pagination/DescribeAlarmsPaginator.ts
+++ b/clients/client-cloudwatch/src/pagination/DescribeAlarmsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeAlarms(
       throw new Error("Invalid client, expected CloudWatch | CloudWatchClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudwatch/src/pagination/DescribeInsightRulesPaginator.ts b/clients/client-cloudwatch/src/pagination/DescribeInsightRulesPaginator.ts
index 36b18f479932..2469789fe1ad 100644
--- a/clients/client-cloudwatch/src/pagination/DescribeInsightRulesPaginator.ts
+++ b/clients/client-cloudwatch/src/pagination/DescribeInsightRulesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeInsightRules(
       throw new Error("Invalid client, expected CloudWatch | CloudWatchClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudwatch/src/pagination/GetMetricDataPaginator.ts b/clients/client-cloudwatch/src/pagination/GetMetricDataPaginator.ts
index 69bea1ccb8d5..801805296a50 100644
--- a/clients/client-cloudwatch/src/pagination/GetMetricDataPaginator.ts
+++ b/clients/client-cloudwatch/src/pagination/GetMetricDataPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetMetricData(
       throw new Error("Invalid client, expected CloudWatch | CloudWatchClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudwatch/src/pagination/ListDashboardsPaginator.ts b/clients/client-cloudwatch/src/pagination/ListDashboardsPaginator.ts
index 529f392beb65..7a70d65774cf 100644
--- a/clients/client-cloudwatch/src/pagination/ListDashboardsPaginator.ts
+++ b/clients/client-cloudwatch/src/pagination/ListDashboardsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListDashboards(
       throw new Error("Invalid client, expected CloudWatch | CloudWatchClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudwatch/src/pagination/ListMetricStreamsPaginator.ts b/clients/client-cloudwatch/src/pagination/ListMetricStreamsPaginator.ts
index 228e52eb452e..74e0013d65cf 100644
--- a/clients/client-cloudwatch/src/pagination/ListMetricStreamsPaginator.ts
+++ b/clients/client-cloudwatch/src/pagination/ListMetricStreamsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListMetricStreams(
       throw new Error("Invalid client, expected CloudWatch | CloudWatchClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cloudwatch/src/pagination/ListMetricsPaginator.ts b/clients/client-cloudwatch/src/pagination/ListMetricsPaginator.ts
index 94fa6c0fb673..409ba803f3c9 100644
--- a/clients/client-cloudwatch/src/pagination/ListMetricsPaginator.ts
+++ b/clients/client-cloudwatch/src/pagination/ListMetricsPaginator.ts
@@ -46,8 +46,9 @@ export async function* paginateListMetrics(
       throw new Error("Invalid client, expected CloudWatch | CloudWatchClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codeartifact/src/pagination/ListDomainsPaginator.ts b/clients/client-codeartifact/src/pagination/ListDomainsPaginator.ts
index da9948e4ebaa..5aff529c2ed2 100644
--- a/clients/client-codeartifact/src/pagination/ListDomainsPaginator.ts
+++ b/clients/client-codeartifact/src/pagination/ListDomainsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListDomains(
       throw new Error("Invalid client, expected Codeartifact | CodeartifactClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codeartifact/src/pagination/ListPackageVersionAssetsPaginator.ts b/clients/client-codeartifact/src/pagination/ListPackageVersionAssetsPaginator.ts
index a88b2accbbda..ae52bbc33185 100644
--- a/clients/client-codeartifact/src/pagination/ListPackageVersionAssetsPaginator.ts
+++ b/clients/client-codeartifact/src/pagination/ListPackageVersionAssetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPackageVersionAssets(
       throw new Error("Invalid client, expected Codeartifact | CodeartifactClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codeartifact/src/pagination/ListPackageVersionsPaginator.ts b/clients/client-codeartifact/src/pagination/ListPackageVersionsPaginator.ts
index 2839936c2b36..f290c127feca 100644
--- a/clients/client-codeartifact/src/pagination/ListPackageVersionsPaginator.ts
+++ b/clients/client-codeartifact/src/pagination/ListPackageVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPackageVersions(
       throw new Error("Invalid client, expected Codeartifact | CodeartifactClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codeartifact/src/pagination/ListPackagesPaginator.ts b/clients/client-codeartifact/src/pagination/ListPackagesPaginator.ts
index 3c583fcfe9da..209e791a42e0 100644
--- a/clients/client-codeartifact/src/pagination/ListPackagesPaginator.ts
+++ b/clients/client-codeartifact/src/pagination/ListPackagesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPackages(
       throw new Error("Invalid client, expected Codeartifact | CodeartifactClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codeartifact/src/pagination/ListRepositoriesInDomainPaginator.ts b/clients/client-codeartifact/src/pagination/ListRepositoriesInDomainPaginator.ts
index 4b932329a1e5..f50a545f9a26 100644
--- a/clients/client-codeartifact/src/pagination/ListRepositoriesInDomainPaginator.ts
+++ b/clients/client-codeartifact/src/pagination/ListRepositoriesInDomainPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRepositoriesInDomain(
       throw new Error("Invalid client, expected Codeartifact | CodeartifactClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codeartifact/src/pagination/ListRepositoriesPaginator.ts b/clients/client-codeartifact/src/pagination/ListRepositoriesPaginator.ts
index 672f44c98ac5..19443d2ebe52 100644
--- a/clients/client-codeartifact/src/pagination/ListRepositoriesPaginator.ts
+++ b/clients/client-codeartifact/src/pagination/ListRepositoriesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRepositories(
       throw new Error("Invalid client, expected Codeartifact | CodeartifactClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codebuild/src/pagination/DescribeCodeCoveragesPaginator.ts b/clients/client-codebuild/src/pagination/DescribeCodeCoveragesPaginator.ts
index 14744f06a0e2..da4fc5034082 100644
--- a/clients/client-codebuild/src/pagination/DescribeCodeCoveragesPaginator.ts
+++ b/clients/client-codebuild/src/pagination/DescribeCodeCoveragesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeCodeCoverages(
       throw new Error("Invalid client, expected CodeBuild | CodeBuildClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codebuild/src/pagination/DescribeTestCasesPaginator.ts b/clients/client-codebuild/src/pagination/DescribeTestCasesPaginator.ts
index 4d74bf48c2da..2d96fcd6ed1b 100644
--- a/clients/client-codebuild/src/pagination/DescribeTestCasesPaginator.ts
+++ b/clients/client-codebuild/src/pagination/DescribeTestCasesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeTestCases(
       throw new Error("Invalid client, expected CodeBuild | CodeBuildClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codebuild/src/pagination/ListBuildBatchesForProjectPaginator.ts b/clients/client-codebuild/src/pagination/ListBuildBatchesForProjectPaginator.ts
index 580be60a0c56..c51adaa64509 100644
--- a/clients/client-codebuild/src/pagination/ListBuildBatchesForProjectPaginator.ts
+++ b/clients/client-codebuild/src/pagination/ListBuildBatchesForProjectPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListBuildBatchesForProject(
       throw new Error("Invalid client, expected CodeBuild | CodeBuildClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codebuild/src/pagination/ListBuildBatchesPaginator.ts b/clients/client-codebuild/src/pagination/ListBuildBatchesPaginator.ts
index bf6d16cf8cb4..320f3b4b8d78 100644
--- a/clients/client-codebuild/src/pagination/ListBuildBatchesPaginator.ts
+++ b/clients/client-codebuild/src/pagination/ListBuildBatchesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListBuildBatches(
       throw new Error("Invalid client, expected CodeBuild | CodeBuildClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codebuild/src/pagination/ListBuildsForProjectPaginator.ts b/clients/client-codebuild/src/pagination/ListBuildsForProjectPaginator.ts
index 64474e67fdb0..38d6d0363797 100644
--- a/clients/client-codebuild/src/pagination/ListBuildsForProjectPaginator.ts
+++ b/clients/client-codebuild/src/pagination/ListBuildsForProjectPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListBuildsForProject(
       throw new Error("Invalid client, expected CodeBuild | CodeBuildClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codebuild/src/pagination/ListBuildsPaginator.ts b/clients/client-codebuild/src/pagination/ListBuildsPaginator.ts
index aae1f846733f..5d813ff87c9d 100644
--- a/clients/client-codebuild/src/pagination/ListBuildsPaginator.ts
+++ b/clients/client-codebuild/src/pagination/ListBuildsPaginator.ts
@@ -46,8 +46,9 @@ export async function* paginateListBuilds(
       throw new Error("Invalid client, expected CodeBuild | CodeBuildClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codebuild/src/pagination/ListProjectsPaginator.ts b/clients/client-codebuild/src/pagination/ListProjectsPaginator.ts
index 5b0242ac5df8..b245dc81eb3a 100644
--- a/clients/client-codebuild/src/pagination/ListProjectsPaginator.ts
+++ b/clients/client-codebuild/src/pagination/ListProjectsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListProjects(
       throw new Error("Invalid client, expected CodeBuild | CodeBuildClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codebuild/src/pagination/ListReportGroupsPaginator.ts b/clients/client-codebuild/src/pagination/ListReportGroupsPaginator.ts
index 6e5cce182e46..36a46d7eec1f 100644
--- a/clients/client-codebuild/src/pagination/ListReportGroupsPaginator.ts
+++ b/clients/client-codebuild/src/pagination/ListReportGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListReportGroups(
       throw new Error("Invalid client, expected CodeBuild | CodeBuildClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codebuild/src/pagination/ListReportsForReportGroupPaginator.ts b/clients/client-codebuild/src/pagination/ListReportsForReportGroupPaginator.ts
index 0a2b0b1f4fe1..a3e373b0d639 100644
--- a/clients/client-codebuild/src/pagination/ListReportsForReportGroupPaginator.ts
+++ b/clients/client-codebuild/src/pagination/ListReportsForReportGroupPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListReportsForReportGroup(
       throw new Error("Invalid client, expected CodeBuild | CodeBuildClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codebuild/src/pagination/ListReportsPaginator.ts b/clients/client-codebuild/src/pagination/ListReportsPaginator.ts
index 8ef00a502f2c..2e5e9ec1ca9a 100644
--- a/clients/client-codebuild/src/pagination/ListReportsPaginator.ts
+++ b/clients/client-codebuild/src/pagination/ListReportsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListReports(
       throw new Error("Invalid client, expected CodeBuild | CodeBuildClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codebuild/src/pagination/ListSharedProjectsPaginator.ts b/clients/client-codebuild/src/pagination/ListSharedProjectsPaginator.ts
index 5e0967d8567f..80ffc4eb0126 100644
--- a/clients/client-codebuild/src/pagination/ListSharedProjectsPaginator.ts
+++ b/clients/client-codebuild/src/pagination/ListSharedProjectsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSharedProjects(
       throw new Error("Invalid client, expected CodeBuild | CodeBuildClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codebuild/src/pagination/ListSharedReportGroupsPaginator.ts b/clients/client-codebuild/src/pagination/ListSharedReportGroupsPaginator.ts
index f66b9ae353b5..606ae8f62f7a 100644
--- a/clients/client-codebuild/src/pagination/ListSharedReportGroupsPaginator.ts
+++ b/clients/client-codebuild/src/pagination/ListSharedReportGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSharedReportGroups(
       throw new Error("Invalid client, expected CodeBuild | CodeBuildClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codecommit/src/pagination/DescribeMergeConflictsPaginator.ts b/clients/client-codecommit/src/pagination/DescribeMergeConflictsPaginator.ts
index 76fd60e38cab..c91b04bb2741 100644
--- a/clients/client-codecommit/src/pagination/DescribeMergeConflictsPaginator.ts
+++ b/clients/client-codecommit/src/pagination/DescribeMergeConflictsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeMergeConflicts(
       throw new Error("Invalid client, expected CodeCommit | CodeCommitClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codecommit/src/pagination/DescribePullRequestEventsPaginator.ts b/clients/client-codecommit/src/pagination/DescribePullRequestEventsPaginator.ts
index 38566e954e61..099d47c01bc5 100644
--- a/clients/client-codecommit/src/pagination/DescribePullRequestEventsPaginator.ts
+++ b/clients/client-codecommit/src/pagination/DescribePullRequestEventsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribePullRequestEvents(
       throw new Error("Invalid client, expected CodeCommit | CodeCommitClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codecommit/src/pagination/GetCommentReactionsPaginator.ts b/clients/client-codecommit/src/pagination/GetCommentReactionsPaginator.ts
index 0b9594f09ee8..5fa31dcf492e 100644
--- a/clients/client-codecommit/src/pagination/GetCommentReactionsPaginator.ts
+++ b/clients/client-codecommit/src/pagination/GetCommentReactionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetCommentReactions(
       throw new Error("Invalid client, expected CodeCommit | CodeCommitClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codecommit/src/pagination/GetCommentsForComparedCommitPaginator.ts b/clients/client-codecommit/src/pagination/GetCommentsForComparedCommitPaginator.ts
index 7bc538b2784d..653525c77bf1 100644
--- a/clients/client-codecommit/src/pagination/GetCommentsForComparedCommitPaginator.ts
+++ b/clients/client-codecommit/src/pagination/GetCommentsForComparedCommitPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetCommentsForComparedCommit(
       throw new Error("Invalid client, expected CodeCommit | CodeCommitClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codecommit/src/pagination/GetCommentsForPullRequestPaginator.ts b/clients/client-codecommit/src/pagination/GetCommentsForPullRequestPaginator.ts
index 21c852f1b5dc..3c42a275c15e 100644
--- a/clients/client-codecommit/src/pagination/GetCommentsForPullRequestPaginator.ts
+++ b/clients/client-codecommit/src/pagination/GetCommentsForPullRequestPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetCommentsForPullRequest(
       throw new Error("Invalid client, expected CodeCommit | CodeCommitClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codecommit/src/pagination/GetDifferencesPaginator.ts b/clients/client-codecommit/src/pagination/GetDifferencesPaginator.ts
index abc447624dd1..3f5ad3a78b50 100644
--- a/clients/client-codecommit/src/pagination/GetDifferencesPaginator.ts
+++ b/clients/client-codecommit/src/pagination/GetDifferencesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetDifferences(
       throw new Error("Invalid client, expected CodeCommit | CodeCommitClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codecommit/src/pagination/GetMergeConflictsPaginator.ts b/clients/client-codecommit/src/pagination/GetMergeConflictsPaginator.ts
index 39ff5360522c..bbf09ff1ebe3 100644
--- a/clients/client-codecommit/src/pagination/GetMergeConflictsPaginator.ts
+++ b/clients/client-codecommit/src/pagination/GetMergeConflictsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetMergeConflicts(
       throw new Error("Invalid client, expected CodeCommit | CodeCommitClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codecommit/src/pagination/ListApprovalRuleTemplatesPaginator.ts b/clients/client-codecommit/src/pagination/ListApprovalRuleTemplatesPaginator.ts
index 8328f18713a8..f1d65cac4848 100644
--- a/clients/client-codecommit/src/pagination/ListApprovalRuleTemplatesPaginator.ts
+++ b/clients/client-codecommit/src/pagination/ListApprovalRuleTemplatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListApprovalRuleTemplates(
       throw new Error("Invalid client, expected CodeCommit | CodeCommitClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codecommit/src/pagination/ListAssociatedApprovalRuleTemplatesForRepositoryPaginator.ts b/clients/client-codecommit/src/pagination/ListAssociatedApprovalRuleTemplatesForRepositoryPaginator.ts
index ceb31048ed66..9a73ba1fd72a 100644
--- a/clients/client-codecommit/src/pagination/ListAssociatedApprovalRuleTemplatesForRepositoryPaginator.ts
+++ b/clients/client-codecommit/src/pagination/ListAssociatedApprovalRuleTemplatesForRepositoryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAssociatedApprovalRuleTemplatesForRepository(
       throw new Error("Invalid client, expected CodeCommit | CodeCommitClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codecommit/src/pagination/ListBranchesPaginator.ts b/clients/client-codecommit/src/pagination/ListBranchesPaginator.ts
index 9612b38beb8f..19886aeef95c 100644
--- a/clients/client-codecommit/src/pagination/ListBranchesPaginator.ts
+++ b/clients/client-codecommit/src/pagination/ListBranchesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListBranches(
       throw new Error("Invalid client, expected CodeCommit | CodeCommitClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codecommit/src/pagination/ListPullRequestsPaginator.ts b/clients/client-codecommit/src/pagination/ListPullRequestsPaginator.ts
index 125b741b3073..bbc05a55410a 100644
--- a/clients/client-codecommit/src/pagination/ListPullRequestsPaginator.ts
+++ b/clients/client-codecommit/src/pagination/ListPullRequestsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPullRequests(
       throw new Error("Invalid client, expected CodeCommit | CodeCommitClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codecommit/src/pagination/ListRepositoriesForApprovalRuleTemplatePaginator.ts b/clients/client-codecommit/src/pagination/ListRepositoriesForApprovalRuleTemplatePaginator.ts
index 67e3a8d3bddc..95e5fafd6b10 100644
--- a/clients/client-codecommit/src/pagination/ListRepositoriesForApprovalRuleTemplatePaginator.ts
+++ b/clients/client-codecommit/src/pagination/ListRepositoriesForApprovalRuleTemplatePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRepositoriesForApprovalRuleTemplate(
       throw new Error("Invalid client, expected CodeCommit | CodeCommitClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codecommit/src/pagination/ListRepositoriesPaginator.ts b/clients/client-codecommit/src/pagination/ListRepositoriesPaginator.ts
index 1d506eab40ad..20ebe92f718f 100644
--- a/clients/client-codecommit/src/pagination/ListRepositoriesPaginator.ts
+++ b/clients/client-codecommit/src/pagination/ListRepositoriesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListRepositories(
       throw new Error("Invalid client, expected CodeCommit | CodeCommitClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codedeploy/src/pagination/ListApplicationRevisionsPaginator.ts b/clients/client-codedeploy/src/pagination/ListApplicationRevisionsPaginator.ts
index 2c1aface2b4e..3a263bf40b22 100644
--- a/clients/client-codedeploy/src/pagination/ListApplicationRevisionsPaginator.ts
+++ b/clients/client-codedeploy/src/pagination/ListApplicationRevisionsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListApplicationRevisions(
       throw new Error("Invalid client, expected CodeDeploy | CodeDeployClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codedeploy/src/pagination/ListApplicationsPaginator.ts b/clients/client-codedeploy/src/pagination/ListApplicationsPaginator.ts
index a8ff2d01080b..28befb60961a 100644
--- a/clients/client-codedeploy/src/pagination/ListApplicationsPaginator.ts
+++ b/clients/client-codedeploy/src/pagination/ListApplicationsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListApplications(
       throw new Error("Invalid client, expected CodeDeploy | CodeDeployClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codedeploy/src/pagination/ListDeploymentConfigsPaginator.ts b/clients/client-codedeploy/src/pagination/ListDeploymentConfigsPaginator.ts
index 722dab11d51a..ff278bfca6bf 100644
--- a/clients/client-codedeploy/src/pagination/ListDeploymentConfigsPaginator.ts
+++ b/clients/client-codedeploy/src/pagination/ListDeploymentConfigsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListDeploymentConfigs(
       throw new Error("Invalid client, expected CodeDeploy | CodeDeployClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codedeploy/src/pagination/ListDeploymentGroupsPaginator.ts b/clients/client-codedeploy/src/pagination/ListDeploymentGroupsPaginator.ts
index 757136495fe0..6423f554513e 100644
--- a/clients/client-codedeploy/src/pagination/ListDeploymentGroupsPaginator.ts
+++ b/clients/client-codedeploy/src/pagination/ListDeploymentGroupsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListDeploymentGroups(
       throw new Error("Invalid client, expected CodeDeploy | CodeDeployClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codedeploy/src/pagination/ListDeploymentInstancesPaginator.ts b/clients/client-codedeploy/src/pagination/ListDeploymentInstancesPaginator.ts
index dee8cc844609..38cf631bc38c 100644
--- a/clients/client-codedeploy/src/pagination/ListDeploymentInstancesPaginator.ts
+++ b/clients/client-codedeploy/src/pagination/ListDeploymentInstancesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListDeploymentInstances(
       throw new Error("Invalid client, expected CodeDeploy | CodeDeployClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codedeploy/src/pagination/ListDeploymentsPaginator.ts b/clients/client-codedeploy/src/pagination/ListDeploymentsPaginator.ts
index 612370e751cb..2f8a47ffe7a5 100644
--- a/clients/client-codedeploy/src/pagination/ListDeploymentsPaginator.ts
+++ b/clients/client-codedeploy/src/pagination/ListDeploymentsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListDeployments(
       throw new Error("Invalid client, expected CodeDeploy | CodeDeployClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codeguru-reviewer/src/pagination/ListCodeReviewsPaginator.ts b/clients/client-codeguru-reviewer/src/pagination/ListCodeReviewsPaginator.ts
index 5966130b9d80..3104328c6341 100644
--- a/clients/client-codeguru-reviewer/src/pagination/ListCodeReviewsPaginator.ts
+++ b/clients/client-codeguru-reviewer/src/pagination/ListCodeReviewsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCodeReviews(
       throw new Error("Invalid client, expected CodeGuruReviewer | CodeGuruReviewerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codeguru-reviewer/src/pagination/ListRecommendationFeedbackPaginator.ts b/clients/client-codeguru-reviewer/src/pagination/ListRecommendationFeedbackPaginator.ts
index 5935c085c763..5a11db880bc4 100644
--- a/clients/client-codeguru-reviewer/src/pagination/ListRecommendationFeedbackPaginator.ts
+++ b/clients/client-codeguru-reviewer/src/pagination/ListRecommendationFeedbackPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRecommendationFeedback(
       throw new Error("Invalid client, expected CodeGuruReviewer | CodeGuruReviewerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codeguru-reviewer/src/pagination/ListRecommendationsPaginator.ts b/clients/client-codeguru-reviewer/src/pagination/ListRecommendationsPaginator.ts
index d179e8625fbb..ce7693c81023 100644
--- a/clients/client-codeguru-reviewer/src/pagination/ListRecommendationsPaginator.ts
+++ b/clients/client-codeguru-reviewer/src/pagination/ListRecommendationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRecommendations(
       throw new Error("Invalid client, expected CodeGuruReviewer | CodeGuruReviewerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codeguru-reviewer/src/pagination/ListRepositoryAssociationsPaginator.ts b/clients/client-codeguru-reviewer/src/pagination/ListRepositoryAssociationsPaginator.ts
index d21ce6fe4576..c9df4f386fa1 100644
--- a/clients/client-codeguru-reviewer/src/pagination/ListRepositoryAssociationsPaginator.ts
+++ b/clients/client-codeguru-reviewer/src/pagination/ListRepositoryAssociationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRepositoryAssociations(
       throw new Error("Invalid client, expected CodeGuruReviewer | CodeGuruReviewerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codeguruprofiler/src/pagination/GetFindingsReportAccountSummaryPaginator.ts b/clients/client-codeguruprofiler/src/pagination/GetFindingsReportAccountSummaryPaginator.ts
index e6096b28cae4..f9ab20d895b0 100644
--- a/clients/client-codeguruprofiler/src/pagination/GetFindingsReportAccountSummaryPaginator.ts
+++ b/clients/client-codeguruprofiler/src/pagination/GetFindingsReportAccountSummaryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetFindingsReportAccountSummary(
       throw new Error("Invalid client, expected CodeGuruProfiler | CodeGuruProfilerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codeguruprofiler/src/pagination/ListFindingsReportsPaginator.ts b/clients/client-codeguruprofiler/src/pagination/ListFindingsReportsPaginator.ts
index a7bf26df1dde..4e99ec3d3cff 100644
--- a/clients/client-codeguruprofiler/src/pagination/ListFindingsReportsPaginator.ts
+++ b/clients/client-codeguruprofiler/src/pagination/ListFindingsReportsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFindingsReports(
       throw new Error("Invalid client, expected CodeGuruProfiler | CodeGuruProfilerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codeguruprofiler/src/pagination/ListProfileTimesPaginator.ts b/clients/client-codeguruprofiler/src/pagination/ListProfileTimesPaginator.ts
index d204ce0b4276..a964859bbd04 100644
--- a/clients/client-codeguruprofiler/src/pagination/ListProfileTimesPaginator.ts
+++ b/clients/client-codeguruprofiler/src/pagination/ListProfileTimesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListProfileTimes(
       throw new Error("Invalid client, expected CodeGuruProfiler | CodeGuruProfilerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codeguruprofiler/src/pagination/ListProfilingGroupsPaginator.ts b/clients/client-codeguruprofiler/src/pagination/ListProfilingGroupsPaginator.ts
index f556dd65a1b2..e34d5db4d288 100644
--- a/clients/client-codeguruprofiler/src/pagination/ListProfilingGroupsPaginator.ts
+++ b/clients/client-codeguruprofiler/src/pagination/ListProfilingGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListProfilingGroups(
       throw new Error("Invalid client, expected CodeGuruProfiler | CodeGuruProfilerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codepipeline/src/pagination/ListActionExecutionsPaginator.ts b/clients/client-codepipeline/src/pagination/ListActionExecutionsPaginator.ts
index 7a8a90a47af8..3e888d527d1f 100644
--- a/clients/client-codepipeline/src/pagination/ListActionExecutionsPaginator.ts
+++ b/clients/client-codepipeline/src/pagination/ListActionExecutionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListActionExecutions(
       throw new Error("Invalid client, expected CodePipeline | CodePipelineClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codepipeline/src/pagination/ListActionTypesPaginator.ts b/clients/client-codepipeline/src/pagination/ListActionTypesPaginator.ts
index faf6a2533460..70db695074f5 100644
--- a/clients/client-codepipeline/src/pagination/ListActionTypesPaginator.ts
+++ b/clients/client-codepipeline/src/pagination/ListActionTypesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListActionTypes(
       throw new Error("Invalid client, expected CodePipeline | CodePipelineClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codepipeline/src/pagination/ListPipelineExecutionsPaginator.ts b/clients/client-codepipeline/src/pagination/ListPipelineExecutionsPaginator.ts
index b344fc89f098..3dbc19ec75f5 100644
--- a/clients/client-codepipeline/src/pagination/ListPipelineExecutionsPaginator.ts
+++ b/clients/client-codepipeline/src/pagination/ListPipelineExecutionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPipelineExecutions(
       throw new Error("Invalid client, expected CodePipeline | CodePipelineClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codepipeline/src/pagination/ListPipelinesPaginator.ts b/clients/client-codepipeline/src/pagination/ListPipelinesPaginator.ts
index 8d3f10770e9d..f599508e9bbe 100644
--- a/clients/client-codepipeline/src/pagination/ListPipelinesPaginator.ts
+++ b/clients/client-codepipeline/src/pagination/ListPipelinesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPipelines(
       throw new Error("Invalid client, expected CodePipeline | CodePipelineClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codepipeline/src/pagination/ListTagsForResourcePaginator.ts b/clients/client-codepipeline/src/pagination/ListTagsForResourcePaginator.ts
index 1e0442835282..093022ed0d70 100644
--- a/clients/client-codepipeline/src/pagination/ListTagsForResourcePaginator.ts
+++ b/clients/client-codepipeline/src/pagination/ListTagsForResourcePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTagsForResource(
       throw new Error("Invalid client, expected CodePipeline | CodePipelineClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codepipeline/src/pagination/ListWebhooksPaginator.ts b/clients/client-codepipeline/src/pagination/ListWebhooksPaginator.ts
index 36a0ec0da204..a32dd0568218 100644
--- a/clients/client-codepipeline/src/pagination/ListWebhooksPaginator.ts
+++ b/clients/client-codepipeline/src/pagination/ListWebhooksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListWebhooks(
       throw new Error("Invalid client, expected CodePipeline | CodePipelineClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codestar-connections/src/pagination/ListConnectionsPaginator.ts b/clients/client-codestar-connections/src/pagination/ListConnectionsPaginator.ts
index 81afc0321317..622259f0f925 100644
--- a/clients/client-codestar-connections/src/pagination/ListConnectionsPaginator.ts
+++ b/clients/client-codestar-connections/src/pagination/ListConnectionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListConnections(
       throw new Error("Invalid client, expected CodeStarConnections | CodeStarConnectionsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codestar-connections/src/pagination/ListHostsPaginator.ts b/clients/client-codestar-connections/src/pagination/ListHostsPaginator.ts
index 677e785a4985..ec50a76c8085 100644
--- a/clients/client-codestar-connections/src/pagination/ListHostsPaginator.ts
+++ b/clients/client-codestar-connections/src/pagination/ListHostsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListHosts(
       throw new Error("Invalid client, expected CodeStarConnections | CodeStarConnectionsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codestar-notifications/src/pagination/ListEventTypesPaginator.ts b/clients/client-codestar-notifications/src/pagination/ListEventTypesPaginator.ts
index 9df4ffe7bb9d..f1d916727308 100644
--- a/clients/client-codestar-notifications/src/pagination/ListEventTypesPaginator.ts
+++ b/clients/client-codestar-notifications/src/pagination/ListEventTypesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEventTypes(
       throw new Error("Invalid client, expected CodestarNotifications | CodestarNotificationsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codestar-notifications/src/pagination/ListNotificationRulesPaginator.ts b/clients/client-codestar-notifications/src/pagination/ListNotificationRulesPaginator.ts
index 1ad26a674ae7..90676ab5099d 100644
--- a/clients/client-codestar-notifications/src/pagination/ListNotificationRulesPaginator.ts
+++ b/clients/client-codestar-notifications/src/pagination/ListNotificationRulesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListNotificationRules(
       throw new Error("Invalid client, expected CodestarNotifications | CodestarNotificationsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-codestar-notifications/src/pagination/ListTargetsPaginator.ts b/clients/client-codestar-notifications/src/pagination/ListTargetsPaginator.ts
index 729545e78b4e..b44321474352 100644
--- a/clients/client-codestar-notifications/src/pagination/ListTargetsPaginator.ts
+++ b/clients/client-codestar-notifications/src/pagination/ListTargetsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListTargets(
       throw new Error("Invalid client, expected CodestarNotifications | CodestarNotificationsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cognito-identity-provider/src/pagination/AdminListGroupsForUserPaginator.ts b/clients/client-cognito-identity-provider/src/pagination/AdminListGroupsForUserPaginator.ts
index 96d92bb6ec96..cb10a70c3225 100644
--- a/clients/client-cognito-identity-provider/src/pagination/AdminListGroupsForUserPaginator.ts
+++ b/clients/client-cognito-identity-provider/src/pagination/AdminListGroupsForUserPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateAdminListGroupsForUser(
       throw new Error("Invalid client, expected CognitoIdentityProvider | CognitoIdentityProviderClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cognito-identity-provider/src/pagination/AdminListUserAuthEventsPaginator.ts b/clients/client-cognito-identity-provider/src/pagination/AdminListUserAuthEventsPaginator.ts
index ff38ed82bf12..e0c35a5867d3 100644
--- a/clients/client-cognito-identity-provider/src/pagination/AdminListUserAuthEventsPaginator.ts
+++ b/clients/client-cognito-identity-provider/src/pagination/AdminListUserAuthEventsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateAdminListUserAuthEvents(
       throw new Error("Invalid client, expected CognitoIdentityProvider | CognitoIdentityProviderClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cognito-identity-provider/src/pagination/ListGroupsPaginator.ts b/clients/client-cognito-identity-provider/src/pagination/ListGroupsPaginator.ts
index abc939605515..e77663b8663c 100644
--- a/clients/client-cognito-identity-provider/src/pagination/ListGroupsPaginator.ts
+++ b/clients/client-cognito-identity-provider/src/pagination/ListGroupsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListGroups(
       throw new Error("Invalid client, expected CognitoIdentityProvider | CognitoIdentityProviderClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cognito-identity-provider/src/pagination/ListIdentityProvidersPaginator.ts b/clients/client-cognito-identity-provider/src/pagination/ListIdentityProvidersPaginator.ts
index 8f01d240f828..6d84abba6a2b 100644
--- a/clients/client-cognito-identity-provider/src/pagination/ListIdentityProvidersPaginator.ts
+++ b/clients/client-cognito-identity-provider/src/pagination/ListIdentityProvidersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListIdentityProviders(
       throw new Error("Invalid client, expected CognitoIdentityProvider | CognitoIdentityProviderClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cognito-identity-provider/src/pagination/ListResourceServersPaginator.ts b/clients/client-cognito-identity-provider/src/pagination/ListResourceServersPaginator.ts
index fe6e2216fffe..cf74a0feb653 100644
--- a/clients/client-cognito-identity-provider/src/pagination/ListResourceServersPaginator.ts
+++ b/clients/client-cognito-identity-provider/src/pagination/ListResourceServersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListResourceServers(
       throw new Error("Invalid client, expected CognitoIdentityProvider | CognitoIdentityProviderClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cognito-identity-provider/src/pagination/ListUserPoolClientsPaginator.ts b/clients/client-cognito-identity-provider/src/pagination/ListUserPoolClientsPaginator.ts
index 5e3d14b86a4f..8399f4757810 100644
--- a/clients/client-cognito-identity-provider/src/pagination/ListUserPoolClientsPaginator.ts
+++ b/clients/client-cognito-identity-provider/src/pagination/ListUserPoolClientsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListUserPoolClients(
       throw new Error("Invalid client, expected CognitoIdentityProvider | CognitoIdentityProviderClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cognito-identity-provider/src/pagination/ListUserPoolsPaginator.ts b/clients/client-cognito-identity-provider/src/pagination/ListUserPoolsPaginator.ts
index c40fefcf43c0..0585b1a9ed94 100644
--- a/clients/client-cognito-identity-provider/src/pagination/ListUserPoolsPaginator.ts
+++ b/clients/client-cognito-identity-provider/src/pagination/ListUserPoolsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListUserPools(
       throw new Error("Invalid client, expected CognitoIdentityProvider | CognitoIdentityProviderClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cognito-identity-provider/src/pagination/ListUsersInGroupPaginator.ts b/clients/client-cognito-identity-provider/src/pagination/ListUsersInGroupPaginator.ts
index db7f3a007070..418e02a8aa2b 100644
--- a/clients/client-cognito-identity-provider/src/pagination/ListUsersInGroupPaginator.ts
+++ b/clients/client-cognito-identity-provider/src/pagination/ListUsersInGroupPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListUsersInGroup(
       throw new Error("Invalid client, expected CognitoIdentityProvider | CognitoIdentityProviderClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cognito-identity-provider/src/pagination/ListUsersPaginator.ts b/clients/client-cognito-identity-provider/src/pagination/ListUsersPaginator.ts
index 0d42e31215f2..0f633a1599ce 100644
--- a/clients/client-cognito-identity-provider/src/pagination/ListUsersPaginator.ts
+++ b/clients/client-cognito-identity-provider/src/pagination/ListUsersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListUsers(
       throw new Error("Invalid client, expected CognitoIdentityProvider | CognitoIdentityProviderClient");
     }
     yield page;
+    const prevToken = token;
     token = page.PaginationToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cognito-identity/src/pagination/ListIdentityPoolsPaginator.ts b/clients/client-cognito-identity/src/pagination/ListIdentityPoolsPaginator.ts
index 58e6f71abca9..f63bf2b35f55 100644
--- a/clients/client-cognito-identity/src/pagination/ListIdentityPoolsPaginator.ts
+++ b/clients/client-cognito-identity/src/pagination/ListIdentityPoolsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListIdentityPools(
       throw new Error("Invalid client, expected CognitoIdentity | CognitoIdentityClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-comprehend/src/pagination/ListDocumentClassificationJobsPaginator.ts b/clients/client-comprehend/src/pagination/ListDocumentClassificationJobsPaginator.ts
index 367535326f68..acbe2139a4fc 100644
--- a/clients/client-comprehend/src/pagination/ListDocumentClassificationJobsPaginator.ts
+++ b/clients/client-comprehend/src/pagination/ListDocumentClassificationJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDocumentClassificationJobs(
       throw new Error("Invalid client, expected Comprehend | ComprehendClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-comprehend/src/pagination/ListDocumentClassifierSummariesPaginator.ts b/clients/client-comprehend/src/pagination/ListDocumentClassifierSummariesPaginator.ts
index 015242e1cb12..f21a5f69afa1 100644
--- a/clients/client-comprehend/src/pagination/ListDocumentClassifierSummariesPaginator.ts
+++ b/clients/client-comprehend/src/pagination/ListDocumentClassifierSummariesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDocumentClassifierSummaries(
       throw new Error("Invalid client, expected Comprehend | ComprehendClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-comprehend/src/pagination/ListDocumentClassifiersPaginator.ts b/clients/client-comprehend/src/pagination/ListDocumentClassifiersPaginator.ts
index 4daa9907a61a..3e6c387e0262 100644
--- a/clients/client-comprehend/src/pagination/ListDocumentClassifiersPaginator.ts
+++ b/clients/client-comprehend/src/pagination/ListDocumentClassifiersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDocumentClassifiers(
       throw new Error("Invalid client, expected Comprehend | ComprehendClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-comprehend/src/pagination/ListDominantLanguageDetectionJobsPaginator.ts b/clients/client-comprehend/src/pagination/ListDominantLanguageDetectionJobsPaginator.ts
index 229f03c88f8a..969af4058ef6 100644
--- a/clients/client-comprehend/src/pagination/ListDominantLanguageDetectionJobsPaginator.ts
+++ b/clients/client-comprehend/src/pagination/ListDominantLanguageDetectionJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDominantLanguageDetectionJobs(
       throw new Error("Invalid client, expected Comprehend | ComprehendClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-comprehend/src/pagination/ListEntitiesDetectionJobsPaginator.ts b/clients/client-comprehend/src/pagination/ListEntitiesDetectionJobsPaginator.ts
index fee7a638d360..6e660806134d 100644
--- a/clients/client-comprehend/src/pagination/ListEntitiesDetectionJobsPaginator.ts
+++ b/clients/client-comprehend/src/pagination/ListEntitiesDetectionJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEntitiesDetectionJobs(
       throw new Error("Invalid client, expected Comprehend | ComprehendClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-comprehend/src/pagination/ListEntityRecognizerSummariesPaginator.ts b/clients/client-comprehend/src/pagination/ListEntityRecognizerSummariesPaginator.ts
index 8614f60a284c..1e3f924a8a70 100644
--- a/clients/client-comprehend/src/pagination/ListEntityRecognizerSummariesPaginator.ts
+++ b/clients/client-comprehend/src/pagination/ListEntityRecognizerSummariesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEntityRecognizerSummaries(
       throw new Error("Invalid client, expected Comprehend | ComprehendClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-comprehend/src/pagination/ListEntityRecognizersPaginator.ts b/clients/client-comprehend/src/pagination/ListEntityRecognizersPaginator.ts
index 2964d8f830e8..a8220de54b64 100644
--- a/clients/client-comprehend/src/pagination/ListEntityRecognizersPaginator.ts
+++ b/clients/client-comprehend/src/pagination/ListEntityRecognizersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEntityRecognizers(
       throw new Error("Invalid client, expected Comprehend | ComprehendClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-comprehend/src/pagination/ListEventsDetectionJobsPaginator.ts b/clients/client-comprehend/src/pagination/ListEventsDetectionJobsPaginator.ts
index c0623f46dcb9..065b591a5030 100644
--- a/clients/client-comprehend/src/pagination/ListEventsDetectionJobsPaginator.ts
+++ b/clients/client-comprehend/src/pagination/ListEventsDetectionJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEventsDetectionJobs(
       throw new Error("Invalid client, expected Comprehend | ComprehendClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-comprehend/src/pagination/ListKeyPhrasesDetectionJobsPaginator.ts b/clients/client-comprehend/src/pagination/ListKeyPhrasesDetectionJobsPaginator.ts
index 14c166f0a9c7..eac5cae664e5 100644
--- a/clients/client-comprehend/src/pagination/ListKeyPhrasesDetectionJobsPaginator.ts
+++ b/clients/client-comprehend/src/pagination/ListKeyPhrasesDetectionJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListKeyPhrasesDetectionJobs(
       throw new Error("Invalid client, expected Comprehend | ComprehendClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-comprehend/src/pagination/ListSentimentDetectionJobsPaginator.ts b/clients/client-comprehend/src/pagination/ListSentimentDetectionJobsPaginator.ts
index 50b402edc5f0..baa6cea245a7 100644
--- a/clients/client-comprehend/src/pagination/ListSentimentDetectionJobsPaginator.ts
+++ b/clients/client-comprehend/src/pagination/ListSentimentDetectionJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSentimentDetectionJobs(
       throw new Error("Invalid client, expected Comprehend | ComprehendClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-comprehend/src/pagination/ListTargetedSentimentDetectionJobsPaginator.ts b/clients/client-comprehend/src/pagination/ListTargetedSentimentDetectionJobsPaginator.ts
index f632f1b85e1e..28638b60cfb7 100644
--- a/clients/client-comprehend/src/pagination/ListTargetedSentimentDetectionJobsPaginator.ts
+++ b/clients/client-comprehend/src/pagination/ListTargetedSentimentDetectionJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTargetedSentimentDetectionJobs(
       throw new Error("Invalid client, expected Comprehend | ComprehendClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-comprehend/src/pagination/ListTopicsDetectionJobsPaginator.ts b/clients/client-comprehend/src/pagination/ListTopicsDetectionJobsPaginator.ts
index 16d75f356210..0ded138d7085 100644
--- a/clients/client-comprehend/src/pagination/ListTopicsDetectionJobsPaginator.ts
+++ b/clients/client-comprehend/src/pagination/ListTopicsDetectionJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTopicsDetectionJobs(
       throw new Error("Invalid client, expected Comprehend | ComprehendClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/DescribeAggregateComplianceByConfigRulesPaginator.ts b/clients/client-config-service/src/pagination/DescribeAggregateComplianceByConfigRulesPaginator.ts
index cd07c53802e9..df39f3927808 100644
--- a/clients/client-config-service/src/pagination/DescribeAggregateComplianceByConfigRulesPaginator.ts
+++ b/clients/client-config-service/src/pagination/DescribeAggregateComplianceByConfigRulesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeAggregateComplianceByConfigRules(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/DescribeAggregateComplianceByConformancePacksPaginator.ts b/clients/client-config-service/src/pagination/DescribeAggregateComplianceByConformancePacksPaginator.ts
index 22827d162610..7492813d0fec 100644
--- a/clients/client-config-service/src/pagination/DescribeAggregateComplianceByConformancePacksPaginator.ts
+++ b/clients/client-config-service/src/pagination/DescribeAggregateComplianceByConformancePacksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeAggregateComplianceByConformancePacks(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/DescribeAggregationAuthorizationsPaginator.ts b/clients/client-config-service/src/pagination/DescribeAggregationAuthorizationsPaginator.ts
index c1fee178f114..705867177b5e 100644
--- a/clients/client-config-service/src/pagination/DescribeAggregationAuthorizationsPaginator.ts
+++ b/clients/client-config-service/src/pagination/DescribeAggregationAuthorizationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeAggregationAuthorizations(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/DescribeComplianceByConfigRulePaginator.ts b/clients/client-config-service/src/pagination/DescribeComplianceByConfigRulePaginator.ts
index 88186e4511d9..f75a7b49dcea 100644
--- a/clients/client-config-service/src/pagination/DescribeComplianceByConfigRulePaginator.ts
+++ b/clients/client-config-service/src/pagination/DescribeComplianceByConfigRulePaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateDescribeComplianceByConfigRule(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/DescribeComplianceByResourcePaginator.ts b/clients/client-config-service/src/pagination/DescribeComplianceByResourcePaginator.ts
index d112464835c8..a0241c68c18a 100644
--- a/clients/client-config-service/src/pagination/DescribeComplianceByResourcePaginator.ts
+++ b/clients/client-config-service/src/pagination/DescribeComplianceByResourcePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeComplianceByResource(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/DescribeConfigRuleEvaluationStatusPaginator.ts b/clients/client-config-service/src/pagination/DescribeConfigRuleEvaluationStatusPaginator.ts
index d16dfbb5630f..e42c12b6aac5 100644
--- a/clients/client-config-service/src/pagination/DescribeConfigRuleEvaluationStatusPaginator.ts
+++ b/clients/client-config-service/src/pagination/DescribeConfigRuleEvaluationStatusPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeConfigRuleEvaluationStatus(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/DescribeConfigRulesPaginator.ts b/clients/client-config-service/src/pagination/DescribeConfigRulesPaginator.ts
index ced535d1bb04..425d9786d88b 100644
--- a/clients/client-config-service/src/pagination/DescribeConfigRulesPaginator.ts
+++ b/clients/client-config-service/src/pagination/DescribeConfigRulesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateDescribeConfigRules(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/DescribeConfigurationAggregatorSourcesStatusPaginator.ts b/clients/client-config-service/src/pagination/DescribeConfigurationAggregatorSourcesStatusPaginator.ts
index 1f7941a24bee..afd4a060c599 100644
--- a/clients/client-config-service/src/pagination/DescribeConfigurationAggregatorSourcesStatusPaginator.ts
+++ b/clients/client-config-service/src/pagination/DescribeConfigurationAggregatorSourcesStatusPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeConfigurationAggregatorSourcesStatus(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/DescribeConfigurationAggregatorsPaginator.ts b/clients/client-config-service/src/pagination/DescribeConfigurationAggregatorsPaginator.ts
index 48c9cca92d54..419f909a6c3e 100644
--- a/clients/client-config-service/src/pagination/DescribeConfigurationAggregatorsPaginator.ts
+++ b/clients/client-config-service/src/pagination/DescribeConfigurationAggregatorsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeConfigurationAggregators(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/DescribeConformancePackCompliancePaginator.ts b/clients/client-config-service/src/pagination/DescribeConformancePackCompliancePaginator.ts
index f5caaf4c49a0..7093a314f0c4 100644
--- a/clients/client-config-service/src/pagination/DescribeConformancePackCompliancePaginator.ts
+++ b/clients/client-config-service/src/pagination/DescribeConformancePackCompliancePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeConformancePackCompliance(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/DescribeConformancePackStatusPaginator.ts b/clients/client-config-service/src/pagination/DescribeConformancePackStatusPaginator.ts
index 34d70983066a..23dd538dab6b 100644
--- a/clients/client-config-service/src/pagination/DescribeConformancePackStatusPaginator.ts
+++ b/clients/client-config-service/src/pagination/DescribeConformancePackStatusPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeConformancePackStatus(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/DescribeConformancePacksPaginator.ts b/clients/client-config-service/src/pagination/DescribeConformancePacksPaginator.ts
index 26244ac7075e..1f59823db3cb 100644
--- a/clients/client-config-service/src/pagination/DescribeConformancePacksPaginator.ts
+++ b/clients/client-config-service/src/pagination/DescribeConformancePacksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeConformancePacks(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/DescribeOrganizationConfigRuleStatusesPaginator.ts b/clients/client-config-service/src/pagination/DescribeOrganizationConfigRuleStatusesPaginator.ts
index 4221db154e0c..fea9a85bc7d0 100644
--- a/clients/client-config-service/src/pagination/DescribeOrganizationConfigRuleStatusesPaginator.ts
+++ b/clients/client-config-service/src/pagination/DescribeOrganizationConfigRuleStatusesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeOrganizationConfigRuleStatuses(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/DescribeOrganizationConfigRulesPaginator.ts b/clients/client-config-service/src/pagination/DescribeOrganizationConfigRulesPaginator.ts
index 9124f618e1c4..3cebff63626d 100644
--- a/clients/client-config-service/src/pagination/DescribeOrganizationConfigRulesPaginator.ts
+++ b/clients/client-config-service/src/pagination/DescribeOrganizationConfigRulesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeOrganizationConfigRules(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/DescribeOrganizationConformancePackStatusesPaginator.ts b/clients/client-config-service/src/pagination/DescribeOrganizationConformancePackStatusesPaginator.ts
index f78ba0d82610..fb0f9197911b 100644
--- a/clients/client-config-service/src/pagination/DescribeOrganizationConformancePackStatusesPaginator.ts
+++ b/clients/client-config-service/src/pagination/DescribeOrganizationConformancePackStatusesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeOrganizationConformancePackStatuses(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/DescribeOrganizationConformancePacksPaginator.ts b/clients/client-config-service/src/pagination/DescribeOrganizationConformancePacksPaginator.ts
index 55a9b58b02d9..1b86816ca525 100644
--- a/clients/client-config-service/src/pagination/DescribeOrganizationConformancePacksPaginator.ts
+++ b/clients/client-config-service/src/pagination/DescribeOrganizationConformancePacksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeOrganizationConformancePacks(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/DescribePendingAggregationRequestsPaginator.ts b/clients/client-config-service/src/pagination/DescribePendingAggregationRequestsPaginator.ts
index 04fededb9bc1..af425090ab51 100644
--- a/clients/client-config-service/src/pagination/DescribePendingAggregationRequestsPaginator.ts
+++ b/clients/client-config-service/src/pagination/DescribePendingAggregationRequestsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribePendingAggregationRequests(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/DescribeRemediationExceptionsPaginator.ts b/clients/client-config-service/src/pagination/DescribeRemediationExceptionsPaginator.ts
index 7153bea7946e..88811ff29295 100644
--- a/clients/client-config-service/src/pagination/DescribeRemediationExceptionsPaginator.ts
+++ b/clients/client-config-service/src/pagination/DescribeRemediationExceptionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeRemediationExceptions(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/DescribeRemediationExecutionStatusPaginator.ts b/clients/client-config-service/src/pagination/DescribeRemediationExecutionStatusPaginator.ts
index 8dc51eb8baef..d8930a5cbda0 100644
--- a/clients/client-config-service/src/pagination/DescribeRemediationExecutionStatusPaginator.ts
+++ b/clients/client-config-service/src/pagination/DescribeRemediationExecutionStatusPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeRemediationExecutionStatus(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/DescribeRetentionConfigurationsPaginator.ts b/clients/client-config-service/src/pagination/DescribeRetentionConfigurationsPaginator.ts
index 4e5cadc4682b..aec6dc5b0908 100644
--- a/clients/client-config-service/src/pagination/DescribeRetentionConfigurationsPaginator.ts
+++ b/clients/client-config-service/src/pagination/DescribeRetentionConfigurationsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateDescribeRetentionConfigurations(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/GetAggregateComplianceDetailsByConfigRulePaginator.ts b/clients/client-config-service/src/pagination/GetAggregateComplianceDetailsByConfigRulePaginator.ts
index 26454a2ffaf1..53d5e766742c 100644
--- a/clients/client-config-service/src/pagination/GetAggregateComplianceDetailsByConfigRulePaginator.ts
+++ b/clients/client-config-service/src/pagination/GetAggregateComplianceDetailsByConfigRulePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetAggregateComplianceDetailsByConfigRule(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/GetAggregateConfigRuleComplianceSummaryPaginator.ts b/clients/client-config-service/src/pagination/GetAggregateConfigRuleComplianceSummaryPaginator.ts
index bd6e47e5132f..19edd5af1d96 100644
--- a/clients/client-config-service/src/pagination/GetAggregateConfigRuleComplianceSummaryPaginator.ts
+++ b/clients/client-config-service/src/pagination/GetAggregateConfigRuleComplianceSummaryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetAggregateConfigRuleComplianceSummary(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/GetAggregateConformancePackComplianceSummaryPaginator.ts b/clients/client-config-service/src/pagination/GetAggregateConformancePackComplianceSummaryPaginator.ts
index e909a7c224db..7a268ee5504b 100644
--- a/clients/client-config-service/src/pagination/GetAggregateConformancePackComplianceSummaryPaginator.ts
+++ b/clients/client-config-service/src/pagination/GetAggregateConformancePackComplianceSummaryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetAggregateConformancePackComplianceSummary(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/GetAggregateDiscoveredResourceCountsPaginator.ts b/clients/client-config-service/src/pagination/GetAggregateDiscoveredResourceCountsPaginator.ts
index f359a0241a6c..4838cd6e66cb 100644
--- a/clients/client-config-service/src/pagination/GetAggregateDiscoveredResourceCountsPaginator.ts
+++ b/clients/client-config-service/src/pagination/GetAggregateDiscoveredResourceCountsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetAggregateDiscoveredResourceCounts(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/GetComplianceDetailsByConfigRulePaginator.ts b/clients/client-config-service/src/pagination/GetComplianceDetailsByConfigRulePaginator.ts
index df47cbc9cfa2..a7d82df24849 100644
--- a/clients/client-config-service/src/pagination/GetComplianceDetailsByConfigRulePaginator.ts
+++ b/clients/client-config-service/src/pagination/GetComplianceDetailsByConfigRulePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetComplianceDetailsByConfigRule(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/GetComplianceDetailsByResourcePaginator.ts b/clients/client-config-service/src/pagination/GetComplianceDetailsByResourcePaginator.ts
index a158fc14c40f..b02562a52b55 100644
--- a/clients/client-config-service/src/pagination/GetComplianceDetailsByResourcePaginator.ts
+++ b/clients/client-config-service/src/pagination/GetComplianceDetailsByResourcePaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateGetComplianceDetailsByResource(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/GetConformancePackComplianceDetailsPaginator.ts b/clients/client-config-service/src/pagination/GetConformancePackComplianceDetailsPaginator.ts
index 9e9cddc2921d..1882f5353c82 100644
--- a/clients/client-config-service/src/pagination/GetConformancePackComplianceDetailsPaginator.ts
+++ b/clients/client-config-service/src/pagination/GetConformancePackComplianceDetailsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetConformancePackComplianceDetails(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/GetConformancePackComplianceSummaryPaginator.ts b/clients/client-config-service/src/pagination/GetConformancePackComplianceSummaryPaginator.ts
index 8c29fa5da37d..982492ed6e46 100644
--- a/clients/client-config-service/src/pagination/GetConformancePackComplianceSummaryPaginator.ts
+++ b/clients/client-config-service/src/pagination/GetConformancePackComplianceSummaryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetConformancePackComplianceSummary(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/GetDiscoveredResourceCountsPaginator.ts b/clients/client-config-service/src/pagination/GetDiscoveredResourceCountsPaginator.ts
index b869f3862568..97a7e7c99a42 100644
--- a/clients/client-config-service/src/pagination/GetDiscoveredResourceCountsPaginator.ts
+++ b/clients/client-config-service/src/pagination/GetDiscoveredResourceCountsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetDiscoveredResourceCounts(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/GetOrganizationConfigRuleDetailedStatusPaginator.ts b/clients/client-config-service/src/pagination/GetOrganizationConfigRuleDetailedStatusPaginator.ts
index 768b8bd223f7..3c50858e6913 100644
--- a/clients/client-config-service/src/pagination/GetOrganizationConfigRuleDetailedStatusPaginator.ts
+++ b/clients/client-config-service/src/pagination/GetOrganizationConfigRuleDetailedStatusPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetOrganizationConfigRuleDetailedStatus(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/GetOrganizationConformancePackDetailedStatusPaginator.ts b/clients/client-config-service/src/pagination/GetOrganizationConformancePackDetailedStatusPaginator.ts
index 3fb5ce0bfcee..b24c52449ade 100644
--- a/clients/client-config-service/src/pagination/GetOrganizationConformancePackDetailedStatusPaginator.ts
+++ b/clients/client-config-service/src/pagination/GetOrganizationConformancePackDetailedStatusPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetOrganizationConformancePackDetailedStatus(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/GetResourceConfigHistoryPaginator.ts b/clients/client-config-service/src/pagination/GetResourceConfigHistoryPaginator.ts
index f56922de8826..420941a0ec49 100644
--- a/clients/client-config-service/src/pagination/GetResourceConfigHistoryPaginator.ts
+++ b/clients/client-config-service/src/pagination/GetResourceConfigHistoryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetResourceConfigHistory(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/ListAggregateDiscoveredResourcesPaginator.ts b/clients/client-config-service/src/pagination/ListAggregateDiscoveredResourcesPaginator.ts
index 4d89ea3c3cc7..5f0dfc12bc40 100644
--- a/clients/client-config-service/src/pagination/ListAggregateDiscoveredResourcesPaginator.ts
+++ b/clients/client-config-service/src/pagination/ListAggregateDiscoveredResourcesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAggregateDiscoveredResources(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/ListDiscoveredResourcesPaginator.ts b/clients/client-config-service/src/pagination/ListDiscoveredResourcesPaginator.ts
index a783cb8a9768..f87aaf696336 100644
--- a/clients/client-config-service/src/pagination/ListDiscoveredResourcesPaginator.ts
+++ b/clients/client-config-service/src/pagination/ListDiscoveredResourcesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDiscoveredResources(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/ListStoredQueriesPaginator.ts b/clients/client-config-service/src/pagination/ListStoredQueriesPaginator.ts
index 41077027d4fe..0b4abcfd3129 100644
--- a/clients/client-config-service/src/pagination/ListStoredQueriesPaginator.ts
+++ b/clients/client-config-service/src/pagination/ListStoredQueriesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListStoredQueries(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/ListTagsForResourcePaginator.ts b/clients/client-config-service/src/pagination/ListTagsForResourcePaginator.ts
index b0fdcba27473..b3073bed33cf 100644
--- a/clients/client-config-service/src/pagination/ListTagsForResourcePaginator.ts
+++ b/clients/client-config-service/src/pagination/ListTagsForResourcePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTagsForResource(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/SelectAggregateResourceConfigPaginator.ts b/clients/client-config-service/src/pagination/SelectAggregateResourceConfigPaginator.ts
index a987778e4e96..e15a2b5fb02a 100644
--- a/clients/client-config-service/src/pagination/SelectAggregateResourceConfigPaginator.ts
+++ b/clients/client-config-service/src/pagination/SelectAggregateResourceConfigPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSelectAggregateResourceConfig(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-config-service/src/pagination/SelectResourceConfigPaginator.ts b/clients/client-config-service/src/pagination/SelectResourceConfigPaginator.ts
index 4b9335231e3c..26137ce83c39 100644
--- a/clients/client-config-service/src/pagination/SelectResourceConfigPaginator.ts
+++ b/clients/client-config-service/src/pagination/SelectResourceConfigPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSelectResourceConfig(
       throw new Error("Invalid client, expected ConfigService | ConfigServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect-contact-lens/src/pagination/ListRealtimeContactAnalysisSegmentsPaginator.ts b/clients/client-connect-contact-lens/src/pagination/ListRealtimeContactAnalysisSegmentsPaginator.ts
index 5ff7be9b700b..a6a2701255a8 100644
--- a/clients/client-connect-contact-lens/src/pagination/ListRealtimeContactAnalysisSegmentsPaginator.ts
+++ b/clients/client-connect-contact-lens/src/pagination/ListRealtimeContactAnalysisSegmentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRealtimeContactAnalysisSegments(
       throw new Error("Invalid client, expected ConnectContactLens | ConnectContactLensClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/GetCurrentMetricDataPaginator.ts b/clients/client-connect/src/pagination/GetCurrentMetricDataPaginator.ts
index d8a2d3a452eb..fc85e62dc351 100644
--- a/clients/client-connect/src/pagination/GetCurrentMetricDataPaginator.ts
+++ b/clients/client-connect/src/pagination/GetCurrentMetricDataPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetCurrentMetricData(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/GetMetricDataPaginator.ts b/clients/client-connect/src/pagination/GetMetricDataPaginator.ts
index c3725315f61e..53ceee4e6d62 100644
--- a/clients/client-connect/src/pagination/GetMetricDataPaginator.ts
+++ b/clients/client-connect/src/pagination/GetMetricDataPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetMetricData(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/ListAgentStatusesPaginator.ts b/clients/client-connect/src/pagination/ListAgentStatusesPaginator.ts
index ab8aea4565d5..408032479a5a 100644
--- a/clients/client-connect/src/pagination/ListAgentStatusesPaginator.ts
+++ b/clients/client-connect/src/pagination/ListAgentStatusesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAgentStatuses(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/ListApprovedOriginsPaginator.ts b/clients/client-connect/src/pagination/ListApprovedOriginsPaginator.ts
index 1ac8bc7d5b1e..3cfac2d1f43b 100644
--- a/clients/client-connect/src/pagination/ListApprovedOriginsPaginator.ts
+++ b/clients/client-connect/src/pagination/ListApprovedOriginsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListApprovedOrigins(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/ListBotsPaginator.ts b/clients/client-connect/src/pagination/ListBotsPaginator.ts
index 4a5c41c3a1fd..5112c0976cd1 100644
--- a/clients/client-connect/src/pagination/ListBotsPaginator.ts
+++ b/clients/client-connect/src/pagination/ListBotsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListBots(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/ListContactFlowModulesPaginator.ts b/clients/client-connect/src/pagination/ListContactFlowModulesPaginator.ts
index 7d8a5e3a4e1e..ec1ca7c9920b 100644
--- a/clients/client-connect/src/pagination/ListContactFlowModulesPaginator.ts
+++ b/clients/client-connect/src/pagination/ListContactFlowModulesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListContactFlowModules(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/ListContactFlowsPaginator.ts b/clients/client-connect/src/pagination/ListContactFlowsPaginator.ts
index 40c8db65991e..f26d6c711837 100644
--- a/clients/client-connect/src/pagination/ListContactFlowsPaginator.ts
+++ b/clients/client-connect/src/pagination/ListContactFlowsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListContactFlows(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/ListContactReferencesPaginator.ts b/clients/client-connect/src/pagination/ListContactReferencesPaginator.ts
index 0fcb84d6c245..235bc376fce1 100644
--- a/clients/client-connect/src/pagination/ListContactReferencesPaginator.ts
+++ b/clients/client-connect/src/pagination/ListContactReferencesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListContactReferences(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/ListDefaultVocabulariesPaginator.ts b/clients/client-connect/src/pagination/ListDefaultVocabulariesPaginator.ts
index 6bd57e407ff2..9006002dad42 100644
--- a/clients/client-connect/src/pagination/ListDefaultVocabulariesPaginator.ts
+++ b/clients/client-connect/src/pagination/ListDefaultVocabulariesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDefaultVocabularies(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/ListHoursOfOperationsPaginator.ts b/clients/client-connect/src/pagination/ListHoursOfOperationsPaginator.ts
index 6a30bb5f62d3..9f8710e88a09 100644
--- a/clients/client-connect/src/pagination/ListHoursOfOperationsPaginator.ts
+++ b/clients/client-connect/src/pagination/ListHoursOfOperationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListHoursOfOperations(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/ListInstanceAttributesPaginator.ts b/clients/client-connect/src/pagination/ListInstanceAttributesPaginator.ts
index 807fb40d9554..41dd443dfdec 100644
--- a/clients/client-connect/src/pagination/ListInstanceAttributesPaginator.ts
+++ b/clients/client-connect/src/pagination/ListInstanceAttributesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListInstanceAttributes(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/ListInstanceStorageConfigsPaginator.ts b/clients/client-connect/src/pagination/ListInstanceStorageConfigsPaginator.ts
index 7278379d7cd4..e0ce6d0f58bf 100644
--- a/clients/client-connect/src/pagination/ListInstanceStorageConfigsPaginator.ts
+++ b/clients/client-connect/src/pagination/ListInstanceStorageConfigsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListInstanceStorageConfigs(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/ListInstancesPaginator.ts b/clients/client-connect/src/pagination/ListInstancesPaginator.ts
index 045292ac5e35..af5f719cdfec 100644
--- a/clients/client-connect/src/pagination/ListInstancesPaginator.ts
+++ b/clients/client-connect/src/pagination/ListInstancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListInstances(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/ListIntegrationAssociationsPaginator.ts b/clients/client-connect/src/pagination/ListIntegrationAssociationsPaginator.ts
index 4db9973684de..1fa739432bd7 100644
--- a/clients/client-connect/src/pagination/ListIntegrationAssociationsPaginator.ts
+++ b/clients/client-connect/src/pagination/ListIntegrationAssociationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListIntegrationAssociations(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/ListLambdaFunctionsPaginator.ts b/clients/client-connect/src/pagination/ListLambdaFunctionsPaginator.ts
index a5ab94788436..840c6ca87039 100644
--- a/clients/client-connect/src/pagination/ListLambdaFunctionsPaginator.ts
+++ b/clients/client-connect/src/pagination/ListLambdaFunctionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListLambdaFunctions(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/ListLexBotsPaginator.ts b/clients/client-connect/src/pagination/ListLexBotsPaginator.ts
index 759f7c3d9cf9..0b9138f5971a 100644
--- a/clients/client-connect/src/pagination/ListLexBotsPaginator.ts
+++ b/clients/client-connect/src/pagination/ListLexBotsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListLexBots(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/ListPhoneNumbersPaginator.ts b/clients/client-connect/src/pagination/ListPhoneNumbersPaginator.ts
index b56e6354743c..c2e24d2b9988 100644
--- a/clients/client-connect/src/pagination/ListPhoneNumbersPaginator.ts
+++ b/clients/client-connect/src/pagination/ListPhoneNumbersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPhoneNumbers(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/ListPromptsPaginator.ts b/clients/client-connect/src/pagination/ListPromptsPaginator.ts
index 4ff2783e4ae8..47aadbaa9145 100644
--- a/clients/client-connect/src/pagination/ListPromptsPaginator.ts
+++ b/clients/client-connect/src/pagination/ListPromptsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListPrompts(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/ListQueueQuickConnectsPaginator.ts b/clients/client-connect/src/pagination/ListQueueQuickConnectsPaginator.ts
index 49ab7a372c5c..466f37a2d0f4 100644
--- a/clients/client-connect/src/pagination/ListQueueQuickConnectsPaginator.ts
+++ b/clients/client-connect/src/pagination/ListQueueQuickConnectsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListQueueQuickConnects(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/ListQueuesPaginator.ts b/clients/client-connect/src/pagination/ListQueuesPaginator.ts
index 13cff01c0144..e75c66556e27 100644
--- a/clients/client-connect/src/pagination/ListQueuesPaginator.ts
+++ b/clients/client-connect/src/pagination/ListQueuesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListQueues(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/ListQuickConnectsPaginator.ts b/clients/client-connect/src/pagination/ListQuickConnectsPaginator.ts
index f0057b256865..41385f351929 100644
--- a/clients/client-connect/src/pagination/ListQuickConnectsPaginator.ts
+++ b/clients/client-connect/src/pagination/ListQuickConnectsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListQuickConnects(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/ListRoutingProfileQueuesPaginator.ts b/clients/client-connect/src/pagination/ListRoutingProfileQueuesPaginator.ts
index f0d79e7676f6..9e554808b94b 100644
--- a/clients/client-connect/src/pagination/ListRoutingProfileQueuesPaginator.ts
+++ b/clients/client-connect/src/pagination/ListRoutingProfileQueuesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRoutingProfileQueues(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/ListRoutingProfilesPaginator.ts b/clients/client-connect/src/pagination/ListRoutingProfilesPaginator.ts
index b3bdc37b68ee..e4b6cde25707 100644
--- a/clients/client-connect/src/pagination/ListRoutingProfilesPaginator.ts
+++ b/clients/client-connect/src/pagination/ListRoutingProfilesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRoutingProfiles(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/ListSecurityKeysPaginator.ts b/clients/client-connect/src/pagination/ListSecurityKeysPaginator.ts
index 9fce87af8040..9920c3696a7a 100644
--- a/clients/client-connect/src/pagination/ListSecurityKeysPaginator.ts
+++ b/clients/client-connect/src/pagination/ListSecurityKeysPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSecurityKeys(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/ListSecurityProfilePermissionsPaginator.ts b/clients/client-connect/src/pagination/ListSecurityProfilePermissionsPaginator.ts
index 612959e6c1e9..092984d350e1 100644
--- a/clients/client-connect/src/pagination/ListSecurityProfilePermissionsPaginator.ts
+++ b/clients/client-connect/src/pagination/ListSecurityProfilePermissionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSecurityProfilePermissions(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/ListSecurityProfilesPaginator.ts b/clients/client-connect/src/pagination/ListSecurityProfilesPaginator.ts
index cec0a445805b..9d41f94f1713 100644
--- a/clients/client-connect/src/pagination/ListSecurityProfilesPaginator.ts
+++ b/clients/client-connect/src/pagination/ListSecurityProfilesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSecurityProfiles(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/ListUseCasesPaginator.ts b/clients/client-connect/src/pagination/ListUseCasesPaginator.ts
index 34eb13fcf336..77d1160b13ee 100644
--- a/clients/client-connect/src/pagination/ListUseCasesPaginator.ts
+++ b/clients/client-connect/src/pagination/ListUseCasesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListUseCases(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/ListUserHierarchyGroupsPaginator.ts b/clients/client-connect/src/pagination/ListUserHierarchyGroupsPaginator.ts
index b6e0a21727e0..543804d7f69d 100644
--- a/clients/client-connect/src/pagination/ListUserHierarchyGroupsPaginator.ts
+++ b/clients/client-connect/src/pagination/ListUserHierarchyGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListUserHierarchyGroups(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/ListUsersPaginator.ts b/clients/client-connect/src/pagination/ListUsersPaginator.ts
index 3ab1d1a3e609..94845ef9374c 100644
--- a/clients/client-connect/src/pagination/ListUsersPaginator.ts
+++ b/clients/client-connect/src/pagination/ListUsersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListUsers(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/SearchVocabulariesPaginator.ts b/clients/client-connect/src/pagination/SearchVocabulariesPaginator.ts
index 28a8afcbf706..4be461b16218 100644
--- a/clients/client-connect/src/pagination/SearchVocabulariesPaginator.ts
+++ b/clients/client-connect/src/pagination/SearchVocabulariesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchVocabularies(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connectparticipant/src/pagination/GetTranscriptPaginator.ts b/clients/client-connectparticipant/src/pagination/GetTranscriptPaginator.ts
index 3a0997bbd94a..4c25b074becf 100644
--- a/clients/client-connectparticipant/src/pagination/GetTranscriptPaginator.ts
+++ b/clients/client-connectparticipant/src/pagination/GetTranscriptPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetTranscript(
       throw new Error("Invalid client, expected ConnectParticipant | ConnectParticipantClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cost-and-usage-report-service/src/pagination/DescribeReportDefinitionsPaginator.ts b/clients/client-cost-and-usage-report-service/src/pagination/DescribeReportDefinitionsPaginator.ts
index 1720e79571b9..fe0cebeddf7f 100644
--- a/clients/client-cost-and-usage-report-service/src/pagination/DescribeReportDefinitionsPaginator.ts
+++ b/clients/client-cost-and-usage-report-service/src/pagination/DescribeReportDefinitionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeReportDefinitions(
       throw new Error("Invalid client, expected CostAndUsageReportService | CostAndUsageReportServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cost-explorer/src/pagination/GetSavingsPlansCoveragePaginator.ts b/clients/client-cost-explorer/src/pagination/GetSavingsPlansCoveragePaginator.ts
index a5e2b645bfb9..e6db668eecb2 100644
--- a/clients/client-cost-explorer/src/pagination/GetSavingsPlansCoveragePaginator.ts
+++ b/clients/client-cost-explorer/src/pagination/GetSavingsPlansCoveragePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetSavingsPlansCoverage(
       throw new Error("Invalid client, expected CostExplorer | CostExplorerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cost-explorer/src/pagination/GetSavingsPlansUtilizationDetailsPaginator.ts b/clients/client-cost-explorer/src/pagination/GetSavingsPlansUtilizationDetailsPaginator.ts
index c1a0732f2cab..dbc4569bebf1 100644
--- a/clients/client-cost-explorer/src/pagination/GetSavingsPlansUtilizationDetailsPaginator.ts
+++ b/clients/client-cost-explorer/src/pagination/GetSavingsPlansUtilizationDetailsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetSavingsPlansUtilizationDetails(
       throw new Error("Invalid client, expected CostExplorer | CostExplorerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-cost-explorer/src/pagination/ListCostCategoryDefinitionsPaginator.ts b/clients/client-cost-explorer/src/pagination/ListCostCategoryDefinitionsPaginator.ts
index 865808e603f3..6da2c6284929 100644
--- a/clients/client-cost-explorer/src/pagination/ListCostCategoryDefinitionsPaginator.ts
+++ b/clients/client-cost-explorer/src/pagination/ListCostCategoryDefinitionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCostCategoryDefinitions(
       throw new Error("Invalid client, expected CostExplorer | CostExplorerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-data-pipeline/src/pagination/DescribeObjectsPaginator.ts b/clients/client-data-pipeline/src/pagination/DescribeObjectsPaginator.ts
index b7abd35e43e5..26d33289f52c 100644
--- a/clients/client-data-pipeline/src/pagination/DescribeObjectsPaginator.ts
+++ b/clients/client-data-pipeline/src/pagination/DescribeObjectsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateDescribeObjects(
       throw new Error("Invalid client, expected DataPipeline | DataPipelineClient");
     }
     yield page;
+    const prevToken = token;
     token = page.marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-data-pipeline/src/pagination/ListPipelinesPaginator.ts b/clients/client-data-pipeline/src/pagination/ListPipelinesPaginator.ts
index 6e83e3691bd8..5f0e8d5a64f9 100644
--- a/clients/client-data-pipeline/src/pagination/ListPipelinesPaginator.ts
+++ b/clients/client-data-pipeline/src/pagination/ListPipelinesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListPipelines(
       throw new Error("Invalid client, expected DataPipeline | DataPipelineClient");
     }
     yield page;
+    const prevToken = token;
     token = page.marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-data-pipeline/src/pagination/QueryObjectsPaginator.ts b/clients/client-data-pipeline/src/pagination/QueryObjectsPaginator.ts
index 03dce0b376e4..fa26a6d757fa 100644
--- a/clients/client-data-pipeline/src/pagination/QueryObjectsPaginator.ts
+++ b/clients/client-data-pipeline/src/pagination/QueryObjectsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateQueryObjects(
       throw new Error("Invalid client, expected DataPipeline | DataPipelineClient");
     }
     yield page;
+    const prevToken = token;
     token = page.marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-database-migration-service/src/pagination/DescribeApplicableIndividualAssessmentsPaginator.ts b/clients/client-database-migration-service/src/pagination/DescribeApplicableIndividualAssessmentsPaginator.ts
index a654c335b00b..97d74c178f03 100644
--- a/clients/client-database-migration-service/src/pagination/DescribeApplicableIndividualAssessmentsPaginator.ts
+++ b/clients/client-database-migration-service/src/pagination/DescribeApplicableIndividualAssessmentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeApplicableIndividualAssessments(
       throw new Error("Invalid client, expected DatabaseMigrationService | DatabaseMigrationServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-database-migration-service/src/pagination/DescribeCertificatesPaginator.ts b/clients/client-database-migration-service/src/pagination/DescribeCertificatesPaginator.ts
index 46a6cca3f43d..a95c16037b08 100644
--- a/clients/client-database-migration-service/src/pagination/DescribeCertificatesPaginator.ts
+++ b/clients/client-database-migration-service/src/pagination/DescribeCertificatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeCertificates(
       throw new Error("Invalid client, expected DatabaseMigrationService | DatabaseMigrationServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-database-migration-service/src/pagination/DescribeConnectionsPaginator.ts b/clients/client-database-migration-service/src/pagination/DescribeConnectionsPaginator.ts
index 6102639f7a6b..76936c4e7986 100644
--- a/clients/client-database-migration-service/src/pagination/DescribeConnectionsPaginator.ts
+++ b/clients/client-database-migration-service/src/pagination/DescribeConnectionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeConnections(
       throw new Error("Invalid client, expected DatabaseMigrationService | DatabaseMigrationServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-database-migration-service/src/pagination/DescribeEndpointSettingsPaginator.ts b/clients/client-database-migration-service/src/pagination/DescribeEndpointSettingsPaginator.ts
index 9ab649e6bcd4..8491e937d35f 100644
--- a/clients/client-database-migration-service/src/pagination/DescribeEndpointSettingsPaginator.ts
+++ b/clients/client-database-migration-service/src/pagination/DescribeEndpointSettingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEndpointSettings(
       throw new Error("Invalid client, expected DatabaseMigrationService | DatabaseMigrationServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-database-migration-service/src/pagination/DescribeEndpointTypesPaginator.ts b/clients/client-database-migration-service/src/pagination/DescribeEndpointTypesPaginator.ts
index a25723c81936..dd8f76771e6e 100644
--- a/clients/client-database-migration-service/src/pagination/DescribeEndpointTypesPaginator.ts
+++ b/clients/client-database-migration-service/src/pagination/DescribeEndpointTypesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEndpointTypes(
       throw new Error("Invalid client, expected DatabaseMigrationService | DatabaseMigrationServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-database-migration-service/src/pagination/DescribeEndpointsPaginator.ts b/clients/client-database-migration-service/src/pagination/DescribeEndpointsPaginator.ts
index 1ce454654859..ee6dc99cffbb 100644
--- a/clients/client-database-migration-service/src/pagination/DescribeEndpointsPaginator.ts
+++ b/clients/client-database-migration-service/src/pagination/DescribeEndpointsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEndpoints(
       throw new Error("Invalid client, expected DatabaseMigrationService | DatabaseMigrationServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-database-migration-service/src/pagination/DescribeEventSubscriptionsPaginator.ts b/clients/client-database-migration-service/src/pagination/DescribeEventSubscriptionsPaginator.ts
index b4084ab23ca6..bda0dd580a5e 100644
--- a/clients/client-database-migration-service/src/pagination/DescribeEventSubscriptionsPaginator.ts
+++ b/clients/client-database-migration-service/src/pagination/DescribeEventSubscriptionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEventSubscriptions(
       throw new Error("Invalid client, expected DatabaseMigrationService | DatabaseMigrationServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-database-migration-service/src/pagination/DescribeEventsPaginator.ts b/clients/client-database-migration-service/src/pagination/DescribeEventsPaginator.ts
index 952962d4af19..3f1524526fe7 100644
--- a/clients/client-database-migration-service/src/pagination/DescribeEventsPaginator.ts
+++ b/clients/client-database-migration-service/src/pagination/DescribeEventsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEvents(
       throw new Error("Invalid client, expected DatabaseMigrationService | DatabaseMigrationServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-database-migration-service/src/pagination/DescribeOrderableReplicationInstancesPaginator.ts b/clients/client-database-migration-service/src/pagination/DescribeOrderableReplicationInstancesPaginator.ts
index 3627043027ac..a140756da4c7 100644
--- a/clients/client-database-migration-service/src/pagination/DescribeOrderableReplicationInstancesPaginator.ts
+++ b/clients/client-database-migration-service/src/pagination/DescribeOrderableReplicationInstancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeOrderableReplicationInstances(
       throw new Error("Invalid client, expected DatabaseMigrationService | DatabaseMigrationServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-database-migration-service/src/pagination/DescribePendingMaintenanceActionsPaginator.ts b/clients/client-database-migration-service/src/pagination/DescribePendingMaintenanceActionsPaginator.ts
index 197e7310897d..71bf3b5f147e 100644
--- a/clients/client-database-migration-service/src/pagination/DescribePendingMaintenanceActionsPaginator.ts
+++ b/clients/client-database-migration-service/src/pagination/DescribePendingMaintenanceActionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribePendingMaintenanceActions(
       throw new Error("Invalid client, expected DatabaseMigrationService | DatabaseMigrationServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-database-migration-service/src/pagination/DescribeReplicationInstanceTaskLogsPaginator.ts b/clients/client-database-migration-service/src/pagination/DescribeReplicationInstanceTaskLogsPaginator.ts
index de54bc1c78ee..cbf3ef795c81 100644
--- a/clients/client-database-migration-service/src/pagination/DescribeReplicationInstanceTaskLogsPaginator.ts
+++ b/clients/client-database-migration-service/src/pagination/DescribeReplicationInstanceTaskLogsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeReplicationInstanceTaskLogs(
       throw new Error("Invalid client, expected DatabaseMigrationService | DatabaseMigrationServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-database-migration-service/src/pagination/DescribeReplicationInstancesPaginator.ts b/clients/client-database-migration-service/src/pagination/DescribeReplicationInstancesPaginator.ts
index 0dcacede0633..ee092cf87ec0 100644
--- a/clients/client-database-migration-service/src/pagination/DescribeReplicationInstancesPaginator.ts
+++ b/clients/client-database-migration-service/src/pagination/DescribeReplicationInstancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeReplicationInstances(
       throw new Error("Invalid client, expected DatabaseMigrationService | DatabaseMigrationServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-database-migration-service/src/pagination/DescribeReplicationSubnetGroupsPaginator.ts b/clients/client-database-migration-service/src/pagination/DescribeReplicationSubnetGroupsPaginator.ts
index 5714f20d7bd1..3edde15e5495 100644
--- a/clients/client-database-migration-service/src/pagination/DescribeReplicationSubnetGroupsPaginator.ts
+++ b/clients/client-database-migration-service/src/pagination/DescribeReplicationSubnetGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeReplicationSubnetGroups(
       throw new Error("Invalid client, expected DatabaseMigrationService | DatabaseMigrationServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-database-migration-service/src/pagination/DescribeReplicationTaskAssessmentResultsPaginator.ts b/clients/client-database-migration-service/src/pagination/DescribeReplicationTaskAssessmentResultsPaginator.ts
index 9064c15920de..f1ef188c74ac 100644
--- a/clients/client-database-migration-service/src/pagination/DescribeReplicationTaskAssessmentResultsPaginator.ts
+++ b/clients/client-database-migration-service/src/pagination/DescribeReplicationTaskAssessmentResultsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeReplicationTaskAssessmentResults(
       throw new Error("Invalid client, expected DatabaseMigrationService | DatabaseMigrationServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-database-migration-service/src/pagination/DescribeReplicationTaskAssessmentRunsPaginator.ts b/clients/client-database-migration-service/src/pagination/DescribeReplicationTaskAssessmentRunsPaginator.ts
index 7b2b648884c5..3b6be4fc2117 100644
--- a/clients/client-database-migration-service/src/pagination/DescribeReplicationTaskAssessmentRunsPaginator.ts
+++ b/clients/client-database-migration-service/src/pagination/DescribeReplicationTaskAssessmentRunsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeReplicationTaskAssessmentRuns(
       throw new Error("Invalid client, expected DatabaseMigrationService | DatabaseMigrationServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-database-migration-service/src/pagination/DescribeReplicationTaskIndividualAssessmentsPaginator.ts b/clients/client-database-migration-service/src/pagination/DescribeReplicationTaskIndividualAssessmentsPaginator.ts
index 2ae7e739f3d8..16837268e5e5 100644
--- a/clients/client-database-migration-service/src/pagination/DescribeReplicationTaskIndividualAssessmentsPaginator.ts
+++ b/clients/client-database-migration-service/src/pagination/DescribeReplicationTaskIndividualAssessmentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeReplicationTaskIndividualAssessments(
       throw new Error("Invalid client, expected DatabaseMigrationService | DatabaseMigrationServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-database-migration-service/src/pagination/DescribeReplicationTasksPaginator.ts b/clients/client-database-migration-service/src/pagination/DescribeReplicationTasksPaginator.ts
index e2571b7dc66c..25003566bec2 100644
--- a/clients/client-database-migration-service/src/pagination/DescribeReplicationTasksPaginator.ts
+++ b/clients/client-database-migration-service/src/pagination/DescribeReplicationTasksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeReplicationTasks(
       throw new Error("Invalid client, expected DatabaseMigrationService | DatabaseMigrationServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-database-migration-service/src/pagination/DescribeSchemasPaginator.ts b/clients/client-database-migration-service/src/pagination/DescribeSchemasPaginator.ts
index 990dbb59e1f1..3e521ed73b53 100644
--- a/clients/client-database-migration-service/src/pagination/DescribeSchemasPaginator.ts
+++ b/clients/client-database-migration-service/src/pagination/DescribeSchemasPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeSchemas(
       throw new Error("Invalid client, expected DatabaseMigrationService | DatabaseMigrationServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-database-migration-service/src/pagination/DescribeTableStatisticsPaginator.ts b/clients/client-database-migration-service/src/pagination/DescribeTableStatisticsPaginator.ts
index 38d6b64ced6f..921022d5f34a 100644
--- a/clients/client-database-migration-service/src/pagination/DescribeTableStatisticsPaginator.ts
+++ b/clients/client-database-migration-service/src/pagination/DescribeTableStatisticsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeTableStatistics(
       throw new Error("Invalid client, expected DatabaseMigrationService | DatabaseMigrationServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-databrew/src/pagination/ListDatasetsPaginator.ts b/clients/client-databrew/src/pagination/ListDatasetsPaginator.ts
index 348b733b31c1..d7fe3dc3b91b 100644
--- a/clients/client-databrew/src/pagination/ListDatasetsPaginator.ts
+++ b/clients/client-databrew/src/pagination/ListDatasetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDatasets(
       throw new Error("Invalid client, expected DataBrew | DataBrewClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-databrew/src/pagination/ListJobRunsPaginator.ts b/clients/client-databrew/src/pagination/ListJobRunsPaginator.ts
index 36b66a1251ce..8f48e48842bc 100644
--- a/clients/client-databrew/src/pagination/ListJobRunsPaginator.ts
+++ b/clients/client-databrew/src/pagination/ListJobRunsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListJobRuns(
       throw new Error("Invalid client, expected DataBrew | DataBrewClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-databrew/src/pagination/ListJobsPaginator.ts b/clients/client-databrew/src/pagination/ListJobsPaginator.ts
index b3c42b899039..7cd0d9e3664a 100644
--- a/clients/client-databrew/src/pagination/ListJobsPaginator.ts
+++ b/clients/client-databrew/src/pagination/ListJobsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListJobs(
       throw new Error("Invalid client, expected DataBrew | DataBrewClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-databrew/src/pagination/ListProjectsPaginator.ts b/clients/client-databrew/src/pagination/ListProjectsPaginator.ts
index 75a291f69790..497af6f68a55 100644
--- a/clients/client-databrew/src/pagination/ListProjectsPaginator.ts
+++ b/clients/client-databrew/src/pagination/ListProjectsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListProjects(
       throw new Error("Invalid client, expected DataBrew | DataBrewClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-databrew/src/pagination/ListRecipeVersionsPaginator.ts b/clients/client-databrew/src/pagination/ListRecipeVersionsPaginator.ts
index 53ab5451f156..f98fb2337774 100644
--- a/clients/client-databrew/src/pagination/ListRecipeVersionsPaginator.ts
+++ b/clients/client-databrew/src/pagination/ListRecipeVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRecipeVersions(
       throw new Error("Invalid client, expected DataBrew | DataBrewClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-databrew/src/pagination/ListRecipesPaginator.ts b/clients/client-databrew/src/pagination/ListRecipesPaginator.ts
index 0fdc0b18d3ac..846e04c972fe 100644
--- a/clients/client-databrew/src/pagination/ListRecipesPaginator.ts
+++ b/clients/client-databrew/src/pagination/ListRecipesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListRecipes(
       throw new Error("Invalid client, expected DataBrew | DataBrewClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-databrew/src/pagination/ListRulesetsPaginator.ts b/clients/client-databrew/src/pagination/ListRulesetsPaginator.ts
index 0e7d9d4c8a32..f92f1586a8c7 100644
--- a/clients/client-databrew/src/pagination/ListRulesetsPaginator.ts
+++ b/clients/client-databrew/src/pagination/ListRulesetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRulesets(
       throw new Error("Invalid client, expected DataBrew | DataBrewClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-databrew/src/pagination/ListSchedulesPaginator.ts b/clients/client-databrew/src/pagination/ListSchedulesPaginator.ts
index 6a0bfa5b55e2..21c2c0bf93e0 100644
--- a/clients/client-databrew/src/pagination/ListSchedulesPaginator.ts
+++ b/clients/client-databrew/src/pagination/ListSchedulesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSchedules(
       throw new Error("Invalid client, expected DataBrew | DataBrewClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-dataexchange/src/pagination/ListDataSetRevisionsPaginator.ts b/clients/client-dataexchange/src/pagination/ListDataSetRevisionsPaginator.ts
index a718e32858f4..48b8308c60e6 100644
--- a/clients/client-dataexchange/src/pagination/ListDataSetRevisionsPaginator.ts
+++ b/clients/client-dataexchange/src/pagination/ListDataSetRevisionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDataSetRevisions(
       throw new Error("Invalid client, expected DataExchange | DataExchangeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-dataexchange/src/pagination/ListDataSetsPaginator.ts b/clients/client-dataexchange/src/pagination/ListDataSetsPaginator.ts
index 756fee9601fe..c7229b6a4078 100644
--- a/clients/client-dataexchange/src/pagination/ListDataSetsPaginator.ts
+++ b/clients/client-dataexchange/src/pagination/ListDataSetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDataSets(
       throw new Error("Invalid client, expected DataExchange | DataExchangeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-dataexchange/src/pagination/ListEventActionsPaginator.ts b/clients/client-dataexchange/src/pagination/ListEventActionsPaginator.ts
index 277abaec9c39..e8cd38918840 100644
--- a/clients/client-dataexchange/src/pagination/ListEventActionsPaginator.ts
+++ b/clients/client-dataexchange/src/pagination/ListEventActionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEventActions(
       throw new Error("Invalid client, expected DataExchange | DataExchangeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-dataexchange/src/pagination/ListJobsPaginator.ts b/clients/client-dataexchange/src/pagination/ListJobsPaginator.ts
index b5fa9bd93648..67c412d549a3 100644
--- a/clients/client-dataexchange/src/pagination/ListJobsPaginator.ts
+++ b/clients/client-dataexchange/src/pagination/ListJobsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListJobs(
       throw new Error("Invalid client, expected DataExchange | DataExchangeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-dataexchange/src/pagination/ListRevisionAssetsPaginator.ts b/clients/client-dataexchange/src/pagination/ListRevisionAssetsPaginator.ts
index dbf7a1e629ed..35ea2b320139 100644
--- a/clients/client-dataexchange/src/pagination/ListRevisionAssetsPaginator.ts
+++ b/clients/client-dataexchange/src/pagination/ListRevisionAssetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRevisionAssets(
       throw new Error("Invalid client, expected DataExchange | DataExchangeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-datasync/src/pagination/ListAgentsPaginator.ts b/clients/client-datasync/src/pagination/ListAgentsPaginator.ts
index 6f7a1b4e6847..7b1a60097511 100644
--- a/clients/client-datasync/src/pagination/ListAgentsPaginator.ts
+++ b/clients/client-datasync/src/pagination/ListAgentsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListAgents(
       throw new Error("Invalid client, expected DataSync | DataSyncClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-datasync/src/pagination/ListLocationsPaginator.ts b/clients/client-datasync/src/pagination/ListLocationsPaginator.ts
index 02487facb14b..0d7721ae57ea 100644
--- a/clients/client-datasync/src/pagination/ListLocationsPaginator.ts
+++ b/clients/client-datasync/src/pagination/ListLocationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListLocations(
       throw new Error("Invalid client, expected DataSync | DataSyncClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-datasync/src/pagination/ListTagsForResourcePaginator.ts b/clients/client-datasync/src/pagination/ListTagsForResourcePaginator.ts
index 76bd86e535b8..6fb0adc05d33 100644
--- a/clients/client-datasync/src/pagination/ListTagsForResourcePaginator.ts
+++ b/clients/client-datasync/src/pagination/ListTagsForResourcePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTagsForResource(
       throw new Error("Invalid client, expected DataSync | DataSyncClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-datasync/src/pagination/ListTaskExecutionsPaginator.ts b/clients/client-datasync/src/pagination/ListTaskExecutionsPaginator.ts
index f08c607ab3ef..86eb794227a3 100644
--- a/clients/client-datasync/src/pagination/ListTaskExecutionsPaginator.ts
+++ b/clients/client-datasync/src/pagination/ListTaskExecutionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTaskExecutions(
       throw new Error("Invalid client, expected DataSync | DataSyncClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-datasync/src/pagination/ListTasksPaginator.ts b/clients/client-datasync/src/pagination/ListTasksPaginator.ts
index e9b0da30592f..6d85ed3008c4 100644
--- a/clients/client-datasync/src/pagination/ListTasksPaginator.ts
+++ b/clients/client-datasync/src/pagination/ListTasksPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListTasks(
       throw new Error("Invalid client, expected DataSync | DataSyncClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-detective/src/pagination/ListGraphsPaginator.ts b/clients/client-detective/src/pagination/ListGraphsPaginator.ts
index 4060bb75b624..4dd9b83aaede 100644
--- a/clients/client-detective/src/pagination/ListGraphsPaginator.ts
+++ b/clients/client-detective/src/pagination/ListGraphsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListGraphs(
       throw new Error("Invalid client, expected Detective | DetectiveClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-detective/src/pagination/ListInvitationsPaginator.ts b/clients/client-detective/src/pagination/ListInvitationsPaginator.ts
index 872cf08bcc97..025a5078d7b8 100644
--- a/clients/client-detective/src/pagination/ListInvitationsPaginator.ts
+++ b/clients/client-detective/src/pagination/ListInvitationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListInvitations(
       throw new Error("Invalid client, expected Detective | DetectiveClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-detective/src/pagination/ListMembersPaginator.ts b/clients/client-detective/src/pagination/ListMembersPaginator.ts
index f45f1035997b..f952ee48ff7b 100644
--- a/clients/client-detective/src/pagination/ListMembersPaginator.ts
+++ b/clients/client-detective/src/pagination/ListMembersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListMembers(
       throw new Error("Invalid client, expected Detective | DetectiveClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-detective/src/pagination/ListOrganizationAdminAccountsPaginator.ts b/clients/client-detective/src/pagination/ListOrganizationAdminAccountsPaginator.ts
index c7b50154c5d7..3767870fbd0b 100644
--- a/clients/client-detective/src/pagination/ListOrganizationAdminAccountsPaginator.ts
+++ b/clients/client-detective/src/pagination/ListOrganizationAdminAccountsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListOrganizationAdminAccounts(
       throw new Error("Invalid client, expected Detective | DetectiveClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-device-farm/src/pagination/GetOfferingStatusPaginator.ts b/clients/client-device-farm/src/pagination/GetOfferingStatusPaginator.ts
index 4e1e061e9897..89343f956494 100644
--- a/clients/client-device-farm/src/pagination/GetOfferingStatusPaginator.ts
+++ b/clients/client-device-farm/src/pagination/GetOfferingStatusPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateGetOfferingStatus(
       throw new Error("Invalid client, expected DeviceFarm | DeviceFarmClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-device-farm/src/pagination/ListArtifactsPaginator.ts b/clients/client-device-farm/src/pagination/ListArtifactsPaginator.ts
index b67855a54842..af23909fb39e 100644
--- a/clients/client-device-farm/src/pagination/ListArtifactsPaginator.ts
+++ b/clients/client-device-farm/src/pagination/ListArtifactsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListArtifacts(
       throw new Error("Invalid client, expected DeviceFarm | DeviceFarmClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-device-farm/src/pagination/ListDevicePoolsPaginator.ts b/clients/client-device-farm/src/pagination/ListDevicePoolsPaginator.ts
index d3de22ee1be9..3ff1411b1b24 100644
--- a/clients/client-device-farm/src/pagination/ListDevicePoolsPaginator.ts
+++ b/clients/client-device-farm/src/pagination/ListDevicePoolsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListDevicePools(
       throw new Error("Invalid client, expected DeviceFarm | DeviceFarmClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-device-farm/src/pagination/ListDevicesPaginator.ts b/clients/client-device-farm/src/pagination/ListDevicesPaginator.ts
index b8b36c071342..2fa9bc3b6060 100644
--- a/clients/client-device-farm/src/pagination/ListDevicesPaginator.ts
+++ b/clients/client-device-farm/src/pagination/ListDevicesPaginator.ts
@@ -46,8 +46,9 @@ export async function* paginateListDevices(
       throw new Error("Invalid client, expected DeviceFarm | DeviceFarmClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-device-farm/src/pagination/ListJobsPaginator.ts b/clients/client-device-farm/src/pagination/ListJobsPaginator.ts
index 58d872b6eab8..40c17dfa853f 100644
--- a/clients/client-device-farm/src/pagination/ListJobsPaginator.ts
+++ b/clients/client-device-farm/src/pagination/ListJobsPaginator.ts
@@ -46,8 +46,9 @@ export async function* paginateListJobs(
       throw new Error("Invalid client, expected DeviceFarm | DeviceFarmClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-device-farm/src/pagination/ListOfferingTransactionsPaginator.ts b/clients/client-device-farm/src/pagination/ListOfferingTransactionsPaginator.ts
index c84429a62475..c4965f2d6f6f 100644
--- a/clients/client-device-farm/src/pagination/ListOfferingTransactionsPaginator.ts
+++ b/clients/client-device-farm/src/pagination/ListOfferingTransactionsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListOfferingTransactions(
       throw new Error("Invalid client, expected DeviceFarm | DeviceFarmClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-device-farm/src/pagination/ListOfferingsPaginator.ts b/clients/client-device-farm/src/pagination/ListOfferingsPaginator.ts
index f23a8fa2ddb9..5b6b77ac7d0a 100644
--- a/clients/client-device-farm/src/pagination/ListOfferingsPaginator.ts
+++ b/clients/client-device-farm/src/pagination/ListOfferingsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListOfferings(
       throw new Error("Invalid client, expected DeviceFarm | DeviceFarmClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-device-farm/src/pagination/ListProjectsPaginator.ts b/clients/client-device-farm/src/pagination/ListProjectsPaginator.ts
index c569cdf468f7..e3d0f1c3c42b 100644
--- a/clients/client-device-farm/src/pagination/ListProjectsPaginator.ts
+++ b/clients/client-device-farm/src/pagination/ListProjectsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListProjects(
       throw new Error("Invalid client, expected DeviceFarm | DeviceFarmClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-device-farm/src/pagination/ListRunsPaginator.ts b/clients/client-device-farm/src/pagination/ListRunsPaginator.ts
index 1e2f1dccea43..0ba86f41d0a1 100644
--- a/clients/client-device-farm/src/pagination/ListRunsPaginator.ts
+++ b/clients/client-device-farm/src/pagination/ListRunsPaginator.ts
@@ -46,8 +46,9 @@ export async function* paginateListRuns(
       throw new Error("Invalid client, expected DeviceFarm | DeviceFarmClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-device-farm/src/pagination/ListSamplesPaginator.ts b/clients/client-device-farm/src/pagination/ListSamplesPaginator.ts
index b40adc4b516a..ff3443dc121d 100644
--- a/clients/client-device-farm/src/pagination/ListSamplesPaginator.ts
+++ b/clients/client-device-farm/src/pagination/ListSamplesPaginator.ts
@@ -46,8 +46,9 @@ export async function* paginateListSamples(
       throw new Error("Invalid client, expected DeviceFarm | DeviceFarmClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-device-farm/src/pagination/ListSuitesPaginator.ts b/clients/client-device-farm/src/pagination/ListSuitesPaginator.ts
index 11b7aae9ca56..fc84bf4bf5ad 100644
--- a/clients/client-device-farm/src/pagination/ListSuitesPaginator.ts
+++ b/clients/client-device-farm/src/pagination/ListSuitesPaginator.ts
@@ -46,8 +46,9 @@ export async function* paginateListSuites(
       throw new Error("Invalid client, expected DeviceFarm | DeviceFarmClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-device-farm/src/pagination/ListTestGridProjectsPaginator.ts b/clients/client-device-farm/src/pagination/ListTestGridProjectsPaginator.ts
index f1e3237292c6..149784c4ba62 100644
--- a/clients/client-device-farm/src/pagination/ListTestGridProjectsPaginator.ts
+++ b/clients/client-device-farm/src/pagination/ListTestGridProjectsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTestGridProjects(
       throw new Error("Invalid client, expected DeviceFarm | DeviceFarmClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-device-farm/src/pagination/ListTestGridSessionActionsPaginator.ts b/clients/client-device-farm/src/pagination/ListTestGridSessionActionsPaginator.ts
index 0f6896f2db51..4d41f26bad97 100644
--- a/clients/client-device-farm/src/pagination/ListTestGridSessionActionsPaginator.ts
+++ b/clients/client-device-farm/src/pagination/ListTestGridSessionActionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTestGridSessionActions(
       throw new Error("Invalid client, expected DeviceFarm | DeviceFarmClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-device-farm/src/pagination/ListTestGridSessionArtifactsPaginator.ts b/clients/client-device-farm/src/pagination/ListTestGridSessionArtifactsPaginator.ts
index 9d00f340d187..52b8ce3f43a7 100644
--- a/clients/client-device-farm/src/pagination/ListTestGridSessionArtifactsPaginator.ts
+++ b/clients/client-device-farm/src/pagination/ListTestGridSessionArtifactsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTestGridSessionArtifacts(
       throw new Error("Invalid client, expected DeviceFarm | DeviceFarmClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-device-farm/src/pagination/ListTestGridSessionsPaginator.ts b/clients/client-device-farm/src/pagination/ListTestGridSessionsPaginator.ts
index 7b9844bd2e47..5595c719b855 100644
--- a/clients/client-device-farm/src/pagination/ListTestGridSessionsPaginator.ts
+++ b/clients/client-device-farm/src/pagination/ListTestGridSessionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTestGridSessions(
       throw new Error("Invalid client, expected DeviceFarm | DeviceFarmClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-device-farm/src/pagination/ListTestsPaginator.ts b/clients/client-device-farm/src/pagination/ListTestsPaginator.ts
index bb963eb314b3..88ff7aa64bd0 100644
--- a/clients/client-device-farm/src/pagination/ListTestsPaginator.ts
+++ b/clients/client-device-farm/src/pagination/ListTestsPaginator.ts
@@ -46,8 +46,9 @@ export async function* paginateListTests(
       throw new Error("Invalid client, expected DeviceFarm | DeviceFarmClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-device-farm/src/pagination/ListUniqueProblemsPaginator.ts b/clients/client-device-farm/src/pagination/ListUniqueProblemsPaginator.ts
index 79feaedcb43e..234f253837c8 100644
--- a/clients/client-device-farm/src/pagination/ListUniqueProblemsPaginator.ts
+++ b/clients/client-device-farm/src/pagination/ListUniqueProblemsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListUniqueProblems(
       throw new Error("Invalid client, expected DeviceFarm | DeviceFarmClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-device-farm/src/pagination/ListUploadsPaginator.ts b/clients/client-device-farm/src/pagination/ListUploadsPaginator.ts
index 505d639d0527..95c3f2f32116 100644
--- a/clients/client-device-farm/src/pagination/ListUploadsPaginator.ts
+++ b/clients/client-device-farm/src/pagination/ListUploadsPaginator.ts
@@ -46,8 +46,9 @@ export async function* paginateListUploads(
       throw new Error("Invalid client, expected DeviceFarm | DeviceFarmClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-devops-guru/src/pagination/DescribeOrganizationResourceCollectionHealthPaginator.ts b/clients/client-devops-guru/src/pagination/DescribeOrganizationResourceCollectionHealthPaginator.ts
index dc32b5719f84..d33e8e6b1bf7 100644
--- a/clients/client-devops-guru/src/pagination/DescribeOrganizationResourceCollectionHealthPaginator.ts
+++ b/clients/client-devops-guru/src/pagination/DescribeOrganizationResourceCollectionHealthPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateDescribeOrganizationResourceCollectionHealth(
       throw new Error("Invalid client, expected DevOpsGuru | DevOpsGuruClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-devops-guru/src/pagination/DescribeResourceCollectionHealthPaginator.ts b/clients/client-devops-guru/src/pagination/DescribeResourceCollectionHealthPaginator.ts
index 421882d61d24..d6f480b040e9 100644
--- a/clients/client-devops-guru/src/pagination/DescribeResourceCollectionHealthPaginator.ts
+++ b/clients/client-devops-guru/src/pagination/DescribeResourceCollectionHealthPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateDescribeResourceCollectionHealth(
       throw new Error("Invalid client, expected DevOpsGuru | DevOpsGuruClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-devops-guru/src/pagination/GetCostEstimationPaginator.ts b/clients/client-devops-guru/src/pagination/GetCostEstimationPaginator.ts
index b2906af851b9..f4e1cbdc79ac 100644
--- a/clients/client-devops-guru/src/pagination/GetCostEstimationPaginator.ts
+++ b/clients/client-devops-guru/src/pagination/GetCostEstimationPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateGetCostEstimation(
       throw new Error("Invalid client, expected DevOpsGuru | DevOpsGuruClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-devops-guru/src/pagination/GetResourceCollectionPaginator.ts b/clients/client-devops-guru/src/pagination/GetResourceCollectionPaginator.ts
index 3b16fd348a7a..4ecd7f1d5aa6 100644
--- a/clients/client-devops-guru/src/pagination/GetResourceCollectionPaginator.ts
+++ b/clients/client-devops-guru/src/pagination/GetResourceCollectionPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateGetResourceCollection(
       throw new Error("Invalid client, expected DevOpsGuru | DevOpsGuruClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-devops-guru/src/pagination/ListAnomaliesForInsightPaginator.ts b/clients/client-devops-guru/src/pagination/ListAnomaliesForInsightPaginator.ts
index d761807680d6..3e487e131a2d 100644
--- a/clients/client-devops-guru/src/pagination/ListAnomaliesForInsightPaginator.ts
+++ b/clients/client-devops-guru/src/pagination/ListAnomaliesForInsightPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAnomaliesForInsight(
       throw new Error("Invalid client, expected DevOpsGuru | DevOpsGuruClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-devops-guru/src/pagination/ListEventsPaginator.ts b/clients/client-devops-guru/src/pagination/ListEventsPaginator.ts
index 940575acc1aa..1be63b10bb7f 100644
--- a/clients/client-devops-guru/src/pagination/ListEventsPaginator.ts
+++ b/clients/client-devops-guru/src/pagination/ListEventsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListEvents(
       throw new Error("Invalid client, expected DevOpsGuru | DevOpsGuruClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-devops-guru/src/pagination/ListInsightsPaginator.ts b/clients/client-devops-guru/src/pagination/ListInsightsPaginator.ts
index dd7d1da6ffa6..1510a33ea962 100644
--- a/clients/client-devops-guru/src/pagination/ListInsightsPaginator.ts
+++ b/clients/client-devops-guru/src/pagination/ListInsightsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListInsights(
       throw new Error("Invalid client, expected DevOpsGuru | DevOpsGuruClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-devops-guru/src/pagination/ListNotificationChannelsPaginator.ts b/clients/client-devops-guru/src/pagination/ListNotificationChannelsPaginator.ts
index ffbeb3ae6a2f..bdc8046a6c1a 100644
--- a/clients/client-devops-guru/src/pagination/ListNotificationChannelsPaginator.ts
+++ b/clients/client-devops-guru/src/pagination/ListNotificationChannelsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListNotificationChannels(
       throw new Error("Invalid client, expected DevOpsGuru | DevOpsGuruClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-devops-guru/src/pagination/ListOrganizationInsightsPaginator.ts b/clients/client-devops-guru/src/pagination/ListOrganizationInsightsPaginator.ts
index d8727c687eed..2cb7e2f13c61 100644
--- a/clients/client-devops-guru/src/pagination/ListOrganizationInsightsPaginator.ts
+++ b/clients/client-devops-guru/src/pagination/ListOrganizationInsightsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListOrganizationInsights(
       throw new Error("Invalid client, expected DevOpsGuru | DevOpsGuruClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-devops-guru/src/pagination/ListRecommendationsPaginator.ts b/clients/client-devops-guru/src/pagination/ListRecommendationsPaginator.ts
index 3f21291b4084..d2abca7ab117 100644
--- a/clients/client-devops-guru/src/pagination/ListRecommendationsPaginator.ts
+++ b/clients/client-devops-guru/src/pagination/ListRecommendationsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListRecommendations(
       throw new Error("Invalid client, expected DevOpsGuru | DevOpsGuruClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-devops-guru/src/pagination/SearchInsightsPaginator.ts b/clients/client-devops-guru/src/pagination/SearchInsightsPaginator.ts
index 7cf0ce361d46..a4ba1c505671 100644
--- a/clients/client-devops-guru/src/pagination/SearchInsightsPaginator.ts
+++ b/clients/client-devops-guru/src/pagination/SearchInsightsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchInsights(
       throw new Error("Invalid client, expected DevOpsGuru | DevOpsGuruClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-devops-guru/src/pagination/SearchOrganizationInsightsPaginator.ts b/clients/client-devops-guru/src/pagination/SearchOrganizationInsightsPaginator.ts
index bbbea2f9d244..6079e0eafef3 100644
--- a/clients/client-devops-guru/src/pagination/SearchOrganizationInsightsPaginator.ts
+++ b/clients/client-devops-guru/src/pagination/SearchOrganizationInsightsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchOrganizationInsights(
       throw new Error("Invalid client, expected DevOpsGuru | DevOpsGuruClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-directory-service/src/pagination/DescribeDomainControllersPaginator.ts b/clients/client-directory-service/src/pagination/DescribeDomainControllersPaginator.ts
index fa68e63ba5b9..eb483b24e2c6 100644
--- a/clients/client-directory-service/src/pagination/DescribeDomainControllersPaginator.ts
+++ b/clients/client-directory-service/src/pagination/DescribeDomainControllersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDomainControllers(
       throw new Error("Invalid client, expected DirectoryService | DirectoryServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-docdb/src/pagination/DescribeCertificatesPaginator.ts b/clients/client-docdb/src/pagination/DescribeCertificatesPaginator.ts
index 1dc4417cc1db..6cbe588cbc81 100644
--- a/clients/client-docdb/src/pagination/DescribeCertificatesPaginator.ts
+++ b/clients/client-docdb/src/pagination/DescribeCertificatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeCertificates(
       throw new Error("Invalid client, expected DocDB | DocDBClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-docdb/src/pagination/DescribeDBClusterParameterGroupsPaginator.ts b/clients/client-docdb/src/pagination/DescribeDBClusterParameterGroupsPaginator.ts
index e5470b146d17..b63be1af64b6 100644
--- a/clients/client-docdb/src/pagination/DescribeDBClusterParameterGroupsPaginator.ts
+++ b/clients/client-docdb/src/pagination/DescribeDBClusterParameterGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBClusterParameterGroups(
       throw new Error("Invalid client, expected DocDB | DocDBClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-docdb/src/pagination/DescribeDBClusterParametersPaginator.ts b/clients/client-docdb/src/pagination/DescribeDBClusterParametersPaginator.ts
index 023318c21c84..37e827f982d9 100644
--- a/clients/client-docdb/src/pagination/DescribeDBClusterParametersPaginator.ts
+++ b/clients/client-docdb/src/pagination/DescribeDBClusterParametersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBClusterParameters(
       throw new Error("Invalid client, expected DocDB | DocDBClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-docdb/src/pagination/DescribeDBClusterSnapshotsPaginator.ts b/clients/client-docdb/src/pagination/DescribeDBClusterSnapshotsPaginator.ts
index 743609e18910..d345a8787387 100644
--- a/clients/client-docdb/src/pagination/DescribeDBClusterSnapshotsPaginator.ts
+++ b/clients/client-docdb/src/pagination/DescribeDBClusterSnapshotsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBClusterSnapshots(
       throw new Error("Invalid client, expected DocDB | DocDBClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-docdb/src/pagination/DescribeDBClustersPaginator.ts b/clients/client-docdb/src/pagination/DescribeDBClustersPaginator.ts
index 51aa0b050f04..c2e0a2e00afc 100644
--- a/clients/client-docdb/src/pagination/DescribeDBClustersPaginator.ts
+++ b/clients/client-docdb/src/pagination/DescribeDBClustersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBClusters(
       throw new Error("Invalid client, expected DocDB | DocDBClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-docdb/src/pagination/DescribeDBEngineVersionsPaginator.ts b/clients/client-docdb/src/pagination/DescribeDBEngineVersionsPaginator.ts
index b711d9cc04ba..d6ec9c742d51 100644
--- a/clients/client-docdb/src/pagination/DescribeDBEngineVersionsPaginator.ts
+++ b/clients/client-docdb/src/pagination/DescribeDBEngineVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBEngineVersions(
       throw new Error("Invalid client, expected DocDB | DocDBClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-docdb/src/pagination/DescribeDBInstancesPaginator.ts b/clients/client-docdb/src/pagination/DescribeDBInstancesPaginator.ts
index aadeafc73bf6..975e39becfc7 100644
--- a/clients/client-docdb/src/pagination/DescribeDBInstancesPaginator.ts
+++ b/clients/client-docdb/src/pagination/DescribeDBInstancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBInstances(
       throw new Error("Invalid client, expected DocDB | DocDBClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-docdb/src/pagination/DescribeDBSubnetGroupsPaginator.ts b/clients/client-docdb/src/pagination/DescribeDBSubnetGroupsPaginator.ts
index 5cfe4675dae5..4ff1ba1f6ce3 100644
--- a/clients/client-docdb/src/pagination/DescribeDBSubnetGroupsPaginator.ts
+++ b/clients/client-docdb/src/pagination/DescribeDBSubnetGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBSubnetGroups(
       throw new Error("Invalid client, expected DocDB | DocDBClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-docdb/src/pagination/DescribeEventSubscriptionsPaginator.ts b/clients/client-docdb/src/pagination/DescribeEventSubscriptionsPaginator.ts
index 55e1be8329d7..7a692aa4a9f8 100644
--- a/clients/client-docdb/src/pagination/DescribeEventSubscriptionsPaginator.ts
+++ b/clients/client-docdb/src/pagination/DescribeEventSubscriptionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEventSubscriptions(
       throw new Error("Invalid client, expected DocDB | DocDBClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-docdb/src/pagination/DescribeEventsPaginator.ts b/clients/client-docdb/src/pagination/DescribeEventsPaginator.ts
index 89d528aa1624..97ced503fc6e 100644
--- a/clients/client-docdb/src/pagination/DescribeEventsPaginator.ts
+++ b/clients/client-docdb/src/pagination/DescribeEventsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEvents(
       throw new Error("Invalid client, expected DocDB | DocDBClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-docdb/src/pagination/DescribeGlobalClustersPaginator.ts b/clients/client-docdb/src/pagination/DescribeGlobalClustersPaginator.ts
index 0bac16d8973f..ae7fffabae0f 100644
--- a/clients/client-docdb/src/pagination/DescribeGlobalClustersPaginator.ts
+++ b/clients/client-docdb/src/pagination/DescribeGlobalClustersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeGlobalClusters(
       throw new Error("Invalid client, expected DocDB | DocDBClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-docdb/src/pagination/DescribeOrderableDBInstanceOptionsPaginator.ts b/clients/client-docdb/src/pagination/DescribeOrderableDBInstanceOptionsPaginator.ts
index 5e5fc5e2bcc1..8b9a850c3221 100644
--- a/clients/client-docdb/src/pagination/DescribeOrderableDBInstanceOptionsPaginator.ts
+++ b/clients/client-docdb/src/pagination/DescribeOrderableDBInstanceOptionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeOrderableDBInstanceOptions(
       throw new Error("Invalid client, expected DocDB | DocDBClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-docdb/src/pagination/DescribePendingMaintenanceActionsPaginator.ts b/clients/client-docdb/src/pagination/DescribePendingMaintenanceActionsPaginator.ts
index 2435ed67497e..6e53f6be2c69 100644
--- a/clients/client-docdb/src/pagination/DescribePendingMaintenanceActionsPaginator.ts
+++ b/clients/client-docdb/src/pagination/DescribePendingMaintenanceActionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribePendingMaintenanceActions(
       throw new Error("Invalid client, expected DocDB | DocDBClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-drs/src/pagination/DescribeJobLogItemsPaginator.ts b/clients/client-drs/src/pagination/DescribeJobLogItemsPaginator.ts
index 9a135e25a5da..1c90e7125871 100644
--- a/clients/client-drs/src/pagination/DescribeJobLogItemsPaginator.ts
+++ b/clients/client-drs/src/pagination/DescribeJobLogItemsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeJobLogItems(
       throw new Error("Invalid client, expected Drs | DrsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-drs/src/pagination/DescribeJobsPaginator.ts b/clients/client-drs/src/pagination/DescribeJobsPaginator.ts
index 95e717820e30..a8e9d197597f 100644
--- a/clients/client-drs/src/pagination/DescribeJobsPaginator.ts
+++ b/clients/client-drs/src/pagination/DescribeJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeJobs(
       throw new Error("Invalid client, expected Drs | DrsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-drs/src/pagination/DescribeRecoveryInstancesPaginator.ts b/clients/client-drs/src/pagination/DescribeRecoveryInstancesPaginator.ts
index 99291dd28950..be7cc5c083f3 100644
--- a/clients/client-drs/src/pagination/DescribeRecoveryInstancesPaginator.ts
+++ b/clients/client-drs/src/pagination/DescribeRecoveryInstancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeRecoveryInstances(
       throw new Error("Invalid client, expected Drs | DrsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-drs/src/pagination/DescribeRecoverySnapshotsPaginator.ts b/clients/client-drs/src/pagination/DescribeRecoverySnapshotsPaginator.ts
index de074f0d6e1a..678d80c4f016 100644
--- a/clients/client-drs/src/pagination/DescribeRecoverySnapshotsPaginator.ts
+++ b/clients/client-drs/src/pagination/DescribeRecoverySnapshotsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeRecoverySnapshots(
       throw new Error("Invalid client, expected Drs | DrsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-drs/src/pagination/DescribeReplicationConfigurationTemplatesPaginator.ts b/clients/client-drs/src/pagination/DescribeReplicationConfigurationTemplatesPaginator.ts
index 63d5cfee6cb2..63108c21c2e4 100644
--- a/clients/client-drs/src/pagination/DescribeReplicationConfigurationTemplatesPaginator.ts
+++ b/clients/client-drs/src/pagination/DescribeReplicationConfigurationTemplatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeReplicationConfigurationTemplates(
       throw new Error("Invalid client, expected Drs | DrsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-drs/src/pagination/DescribeSourceServersPaginator.ts b/clients/client-drs/src/pagination/DescribeSourceServersPaginator.ts
index 3a9f6bb89ef9..442733ffc930 100644
--- a/clients/client-drs/src/pagination/DescribeSourceServersPaginator.ts
+++ b/clients/client-drs/src/pagination/DescribeSourceServersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeSourceServers(
       throw new Error("Invalid client, expected Drs | DrsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-dynamodb/src/pagination/ListContributorInsightsPaginator.ts b/clients/client-dynamodb/src/pagination/ListContributorInsightsPaginator.ts
index 025026d013ae..dd7134e1c0c2 100644
--- a/clients/client-dynamodb/src/pagination/ListContributorInsightsPaginator.ts
+++ b/clients/client-dynamodb/src/pagination/ListContributorInsightsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListContributorInsights(
       throw new Error("Invalid client, expected DynamoDB | DynamoDBClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-dynamodb/src/pagination/ListExportsPaginator.ts b/clients/client-dynamodb/src/pagination/ListExportsPaginator.ts
index 0f4740da84e9..764058f8b6f5 100644
--- a/clients/client-dynamodb/src/pagination/ListExportsPaginator.ts
+++ b/clients/client-dynamodb/src/pagination/ListExportsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListExports(
       throw new Error("Invalid client, expected DynamoDB | DynamoDBClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-dynamodb/src/pagination/ListTablesPaginator.ts b/clients/client-dynamodb/src/pagination/ListTablesPaginator.ts
index bd02d8d9d5c8..1d9909e93617 100644
--- a/clients/client-dynamodb/src/pagination/ListTablesPaginator.ts
+++ b/clients/client-dynamodb/src/pagination/ListTablesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListTables(
       throw new Error("Invalid client, expected DynamoDB | DynamoDBClient");
     }
     yield page;
+    const prevToken = token;
     token = page.LastEvaluatedTableName;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-dynamodb/src/pagination/QueryPaginator.ts b/clients/client-dynamodb/src/pagination/QueryPaginator.ts
index 0c4f34fe21b0..1b4e0414cfbc 100644
--- a/clients/client-dynamodb/src/pagination/QueryPaginator.ts
+++ b/clients/client-dynamodb/src/pagination/QueryPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateQuery(
       throw new Error("Invalid client, expected DynamoDB | DynamoDBClient");
     }
     yield page;
+    const prevToken = token;
     token = page.LastEvaluatedKey;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-dynamodb/src/pagination/ScanPaginator.ts b/clients/client-dynamodb/src/pagination/ScanPaginator.ts
index 5a943c80ab7f..424418381783 100644
--- a/clients/client-dynamodb/src/pagination/ScanPaginator.ts
+++ b/clients/client-dynamodb/src/pagination/ScanPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateScan(
       throw new Error("Invalid client, expected DynamoDB | DynamoDBClient");
     }
     yield page;
+    const prevToken = token;
     token = page.LastEvaluatedKey;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ebs/src/pagination/ListChangedBlocksPaginator.ts b/clients/client-ebs/src/pagination/ListChangedBlocksPaginator.ts
index 723404b94bad..66748fda9f9e 100644
--- a/clients/client-ebs/src/pagination/ListChangedBlocksPaginator.ts
+++ b/clients/client-ebs/src/pagination/ListChangedBlocksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListChangedBlocks(
       throw new Error("Invalid client, expected EBS | EBSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ebs/src/pagination/ListSnapshotBlocksPaginator.ts b/clients/client-ebs/src/pagination/ListSnapshotBlocksPaginator.ts
index e6cec26f0bc8..ccd002228ce7 100644
--- a/clients/client-ebs/src/pagination/ListSnapshotBlocksPaginator.ts
+++ b/clients/client-ebs/src/pagination/ListSnapshotBlocksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSnapshotBlocks(
       throw new Error("Invalid client, expected EBS | EBSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeAddressesAttributePaginator.ts b/clients/client-ec2/src/pagination/DescribeAddressesAttributePaginator.ts
index d094ad6d13a7..2cf13cdd2e67 100644
--- a/clients/client-ec2/src/pagination/DescribeAddressesAttributePaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeAddressesAttributePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeAddressesAttribute(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeByoipCidrsPaginator.ts b/clients/client-ec2/src/pagination/DescribeByoipCidrsPaginator.ts
index 3b05860cb12e..6b9d96ff1b6b 100644
--- a/clients/client-ec2/src/pagination/DescribeByoipCidrsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeByoipCidrsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeByoipCidrs(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeCapacityReservationFleetsPaginator.ts b/clients/client-ec2/src/pagination/DescribeCapacityReservationFleetsPaginator.ts
index a1b84e9dfbe6..146306c1f779 100644
--- a/clients/client-ec2/src/pagination/DescribeCapacityReservationFleetsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeCapacityReservationFleetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeCapacityReservationFleets(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeCapacityReservationsPaginator.ts b/clients/client-ec2/src/pagination/DescribeCapacityReservationsPaginator.ts
index c6583f86d98f..43ec8218f669 100644
--- a/clients/client-ec2/src/pagination/DescribeCapacityReservationsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeCapacityReservationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeCapacityReservations(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeCarrierGatewaysPaginator.ts b/clients/client-ec2/src/pagination/DescribeCarrierGatewaysPaginator.ts
index 3e8177ff5d03..7cd54070e94e 100644
--- a/clients/client-ec2/src/pagination/DescribeCarrierGatewaysPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeCarrierGatewaysPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeCarrierGateways(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeClassicLinkInstancesPaginator.ts b/clients/client-ec2/src/pagination/DescribeClassicLinkInstancesPaginator.ts
index fc55d56d0112..333477a4ee39 100644
--- a/clients/client-ec2/src/pagination/DescribeClassicLinkInstancesPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeClassicLinkInstancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeClassicLinkInstances(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeClientVpnAuthorizationRulesPaginator.ts b/clients/client-ec2/src/pagination/DescribeClientVpnAuthorizationRulesPaginator.ts
index 973aee0541da..c9011966cf13 100644
--- a/clients/client-ec2/src/pagination/DescribeClientVpnAuthorizationRulesPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeClientVpnAuthorizationRulesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeClientVpnAuthorizationRules(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeClientVpnConnectionsPaginator.ts b/clients/client-ec2/src/pagination/DescribeClientVpnConnectionsPaginator.ts
index bab4bcb16e67..d6e28ec77716 100644
--- a/clients/client-ec2/src/pagination/DescribeClientVpnConnectionsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeClientVpnConnectionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeClientVpnConnections(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeClientVpnEndpointsPaginator.ts b/clients/client-ec2/src/pagination/DescribeClientVpnEndpointsPaginator.ts
index 6d9382bd60c2..cc5e677855ca 100644
--- a/clients/client-ec2/src/pagination/DescribeClientVpnEndpointsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeClientVpnEndpointsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeClientVpnEndpoints(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeClientVpnRoutesPaginator.ts b/clients/client-ec2/src/pagination/DescribeClientVpnRoutesPaginator.ts
index 30d14da241b9..49632383297a 100644
--- a/clients/client-ec2/src/pagination/DescribeClientVpnRoutesPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeClientVpnRoutesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeClientVpnRoutes(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeClientVpnTargetNetworksPaginator.ts b/clients/client-ec2/src/pagination/DescribeClientVpnTargetNetworksPaginator.ts
index f446fa6edc82..9a5cafa4258e 100644
--- a/clients/client-ec2/src/pagination/DescribeClientVpnTargetNetworksPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeClientVpnTargetNetworksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeClientVpnTargetNetworks(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeCoipPoolsPaginator.ts b/clients/client-ec2/src/pagination/DescribeCoipPoolsPaginator.ts
index a5435c8d5540..4016d5eed548 100644
--- a/clients/client-ec2/src/pagination/DescribeCoipPoolsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeCoipPoolsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeCoipPools(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeDhcpOptionsPaginator.ts b/clients/client-ec2/src/pagination/DescribeDhcpOptionsPaginator.ts
index 693b1c5c1d16..93911cddcc60 100644
--- a/clients/client-ec2/src/pagination/DescribeDhcpOptionsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeDhcpOptionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDhcpOptions(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeEgressOnlyInternetGatewaysPaginator.ts b/clients/client-ec2/src/pagination/DescribeEgressOnlyInternetGatewaysPaginator.ts
index 846a533abcae..ca32095e6749 100644
--- a/clients/client-ec2/src/pagination/DescribeEgressOnlyInternetGatewaysPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeEgressOnlyInternetGatewaysPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEgressOnlyInternetGateways(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeExportImageTasksPaginator.ts b/clients/client-ec2/src/pagination/DescribeExportImageTasksPaginator.ts
index 7bb87bc93739..278605723d36 100644
--- a/clients/client-ec2/src/pagination/DescribeExportImageTasksPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeExportImageTasksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeExportImageTasks(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeFastLaunchImagesPaginator.ts b/clients/client-ec2/src/pagination/DescribeFastLaunchImagesPaginator.ts
index 8039a61e0617..8c9276c498f1 100644
--- a/clients/client-ec2/src/pagination/DescribeFastLaunchImagesPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeFastLaunchImagesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeFastLaunchImages(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeFastSnapshotRestoresPaginator.ts b/clients/client-ec2/src/pagination/DescribeFastSnapshotRestoresPaginator.ts
index 39efad1b8b55..57b6bd706d70 100644
--- a/clients/client-ec2/src/pagination/DescribeFastSnapshotRestoresPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeFastSnapshotRestoresPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeFastSnapshotRestores(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeFleetsPaginator.ts b/clients/client-ec2/src/pagination/DescribeFleetsPaginator.ts
index 491a629eca86..0b36bddc4d48 100644
--- a/clients/client-ec2/src/pagination/DescribeFleetsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeFleetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeFleets(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeFlowLogsPaginator.ts b/clients/client-ec2/src/pagination/DescribeFlowLogsPaginator.ts
index 3866514fca9a..d000dd234dde 100644
--- a/clients/client-ec2/src/pagination/DescribeFlowLogsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeFlowLogsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeFlowLogs(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeFpgaImagesPaginator.ts b/clients/client-ec2/src/pagination/DescribeFpgaImagesPaginator.ts
index 68309786b309..eaf08496989c 100644
--- a/clients/client-ec2/src/pagination/DescribeFpgaImagesPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeFpgaImagesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeFpgaImages(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeHostReservationOfferingsPaginator.ts b/clients/client-ec2/src/pagination/DescribeHostReservationOfferingsPaginator.ts
index 2050b25b8630..eb06d3761a9e 100644
--- a/clients/client-ec2/src/pagination/DescribeHostReservationOfferingsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeHostReservationOfferingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeHostReservationOfferings(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeHostReservationsPaginator.ts b/clients/client-ec2/src/pagination/DescribeHostReservationsPaginator.ts
index cc37b2f54a1d..ced199c1d1d6 100644
--- a/clients/client-ec2/src/pagination/DescribeHostReservationsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeHostReservationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeHostReservations(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeHostsPaginator.ts b/clients/client-ec2/src/pagination/DescribeHostsPaginator.ts
index 0a266bb7c7b6..0e902d60d5f9 100644
--- a/clients/client-ec2/src/pagination/DescribeHostsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeHostsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeHosts(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeIamInstanceProfileAssociationsPaginator.ts b/clients/client-ec2/src/pagination/DescribeIamInstanceProfileAssociationsPaginator.ts
index a1f1ab9f2eee..eb6b42b253e7 100644
--- a/clients/client-ec2/src/pagination/DescribeIamInstanceProfileAssociationsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeIamInstanceProfileAssociationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeIamInstanceProfileAssociations(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeImportImageTasksPaginator.ts b/clients/client-ec2/src/pagination/DescribeImportImageTasksPaginator.ts
index f20f64330b13..22b1a8feb346 100644
--- a/clients/client-ec2/src/pagination/DescribeImportImageTasksPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeImportImageTasksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeImportImageTasks(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeImportSnapshotTasksPaginator.ts b/clients/client-ec2/src/pagination/DescribeImportSnapshotTasksPaginator.ts
index 626903094bf1..fbd344f56cae 100644
--- a/clients/client-ec2/src/pagination/DescribeImportSnapshotTasksPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeImportSnapshotTasksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeImportSnapshotTasks(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeInstanceCreditSpecificationsPaginator.ts b/clients/client-ec2/src/pagination/DescribeInstanceCreditSpecificationsPaginator.ts
index b835c89a2bc0..32ce1eefba5b 100644
--- a/clients/client-ec2/src/pagination/DescribeInstanceCreditSpecificationsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeInstanceCreditSpecificationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeInstanceCreditSpecifications(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeInstanceEventWindowsPaginator.ts b/clients/client-ec2/src/pagination/DescribeInstanceEventWindowsPaginator.ts
index 7122f95e1307..7506d2df458a 100644
--- a/clients/client-ec2/src/pagination/DescribeInstanceEventWindowsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeInstanceEventWindowsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeInstanceEventWindows(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeInstanceStatusPaginator.ts b/clients/client-ec2/src/pagination/DescribeInstanceStatusPaginator.ts
index d0fa6da65f36..38cd43be5b3d 100644
--- a/clients/client-ec2/src/pagination/DescribeInstanceStatusPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeInstanceStatusPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeInstanceStatus(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeInstanceTypeOfferingsPaginator.ts b/clients/client-ec2/src/pagination/DescribeInstanceTypeOfferingsPaginator.ts
index 4fed540df962..a06197347059 100644
--- a/clients/client-ec2/src/pagination/DescribeInstanceTypeOfferingsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeInstanceTypeOfferingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeInstanceTypeOfferings(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeInstanceTypesPaginator.ts b/clients/client-ec2/src/pagination/DescribeInstanceTypesPaginator.ts
index 7e9e755b7687..81aec26842d3 100644
--- a/clients/client-ec2/src/pagination/DescribeInstanceTypesPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeInstanceTypesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeInstanceTypes(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeInstancesPaginator.ts b/clients/client-ec2/src/pagination/DescribeInstancesPaginator.ts
index 21afb397043f..f68472830f2c 100644
--- a/clients/client-ec2/src/pagination/DescribeInstancesPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeInstancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeInstances(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeInternetGatewaysPaginator.ts b/clients/client-ec2/src/pagination/DescribeInternetGatewaysPaginator.ts
index f3fa145c5b04..5a480a66fe6a 100644
--- a/clients/client-ec2/src/pagination/DescribeInternetGatewaysPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeInternetGatewaysPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeInternetGateways(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeIpamPoolsPaginator.ts b/clients/client-ec2/src/pagination/DescribeIpamPoolsPaginator.ts
index 48d6824addd3..58eabcdcfcd0 100644
--- a/clients/client-ec2/src/pagination/DescribeIpamPoolsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeIpamPoolsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeIpamPools(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeIpamScopesPaginator.ts b/clients/client-ec2/src/pagination/DescribeIpamScopesPaginator.ts
index a93232805387..56572a5959e9 100644
--- a/clients/client-ec2/src/pagination/DescribeIpamScopesPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeIpamScopesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeIpamScopes(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeIpamsPaginator.ts b/clients/client-ec2/src/pagination/DescribeIpamsPaginator.ts
index cbda6f4d84ab..d1a8357eed9c 100644
--- a/clients/client-ec2/src/pagination/DescribeIpamsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeIpamsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeIpams(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeIpv6PoolsPaginator.ts b/clients/client-ec2/src/pagination/DescribeIpv6PoolsPaginator.ts
index e1e499b66aec..fc890e321773 100644
--- a/clients/client-ec2/src/pagination/DescribeIpv6PoolsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeIpv6PoolsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeIpv6Pools(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeLaunchTemplateVersionsPaginator.ts b/clients/client-ec2/src/pagination/DescribeLaunchTemplateVersionsPaginator.ts
index f89b68769880..e958ee140556 100644
--- a/clients/client-ec2/src/pagination/DescribeLaunchTemplateVersionsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeLaunchTemplateVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeLaunchTemplateVersions(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeLaunchTemplatesPaginator.ts b/clients/client-ec2/src/pagination/DescribeLaunchTemplatesPaginator.ts
index 0935e653f5b3..e0b2c771eccb 100644
--- a/clients/client-ec2/src/pagination/DescribeLaunchTemplatesPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeLaunchTemplatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeLaunchTemplates(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociationsPaginator.ts b/clients/client-ec2/src/pagination/DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociationsPaginator.ts
index 89f2c5eefc2d..9db6d0e0a564 100644
--- a/clients/client-ec2/src/pagination/DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociationsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeLocalGatewayRouteTableVirtualInterfaceGro
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeLocalGatewayRouteTableVpcAssociationsPaginator.ts b/clients/client-ec2/src/pagination/DescribeLocalGatewayRouteTableVpcAssociationsPaginator.ts
index 985c7883eed8..3db5ffb17583 100644
--- a/clients/client-ec2/src/pagination/DescribeLocalGatewayRouteTableVpcAssociationsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeLocalGatewayRouteTableVpcAssociationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeLocalGatewayRouteTableVpcAssociations(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeLocalGatewayRouteTablesPaginator.ts b/clients/client-ec2/src/pagination/DescribeLocalGatewayRouteTablesPaginator.ts
index 708db5fcd3ad..82c9149f0ca2 100644
--- a/clients/client-ec2/src/pagination/DescribeLocalGatewayRouteTablesPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeLocalGatewayRouteTablesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeLocalGatewayRouteTables(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeLocalGatewayVirtualInterfaceGroupsPaginator.ts b/clients/client-ec2/src/pagination/DescribeLocalGatewayVirtualInterfaceGroupsPaginator.ts
index 0b812fe40dc7..4808942aa785 100644
--- a/clients/client-ec2/src/pagination/DescribeLocalGatewayVirtualInterfaceGroupsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeLocalGatewayVirtualInterfaceGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeLocalGatewayVirtualInterfaceGroups(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeLocalGatewayVirtualInterfacesPaginator.ts b/clients/client-ec2/src/pagination/DescribeLocalGatewayVirtualInterfacesPaginator.ts
index 6f754f97872f..a8bf0661b73e 100644
--- a/clients/client-ec2/src/pagination/DescribeLocalGatewayVirtualInterfacesPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeLocalGatewayVirtualInterfacesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeLocalGatewayVirtualInterfaces(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeLocalGatewaysPaginator.ts b/clients/client-ec2/src/pagination/DescribeLocalGatewaysPaginator.ts
index 555f272f6a69..b44c01766635 100644
--- a/clients/client-ec2/src/pagination/DescribeLocalGatewaysPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeLocalGatewaysPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeLocalGateways(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeManagedPrefixListsPaginator.ts b/clients/client-ec2/src/pagination/DescribeManagedPrefixListsPaginator.ts
index 629cad483f25..a00b53c77980 100644
--- a/clients/client-ec2/src/pagination/DescribeManagedPrefixListsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeManagedPrefixListsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeManagedPrefixLists(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeMovingAddressesPaginator.ts b/clients/client-ec2/src/pagination/DescribeMovingAddressesPaginator.ts
index 8582ced80bc1..d3ab5bcb2c6b 100644
--- a/clients/client-ec2/src/pagination/DescribeMovingAddressesPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeMovingAddressesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeMovingAddresses(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeNatGatewaysPaginator.ts b/clients/client-ec2/src/pagination/DescribeNatGatewaysPaginator.ts
index 49356c0a3a78..c368164045c6 100644
--- a/clients/client-ec2/src/pagination/DescribeNatGatewaysPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeNatGatewaysPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeNatGateways(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeNetworkAclsPaginator.ts b/clients/client-ec2/src/pagination/DescribeNetworkAclsPaginator.ts
index 7bcaf897c03d..f842ea579998 100644
--- a/clients/client-ec2/src/pagination/DescribeNetworkAclsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeNetworkAclsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeNetworkAcls(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeNetworkInsightsAccessScopeAnalysesPaginator.ts b/clients/client-ec2/src/pagination/DescribeNetworkInsightsAccessScopeAnalysesPaginator.ts
index e41be81a356d..faf8a79c5347 100644
--- a/clients/client-ec2/src/pagination/DescribeNetworkInsightsAccessScopeAnalysesPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeNetworkInsightsAccessScopeAnalysesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeNetworkInsightsAccessScopeAnalyses(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeNetworkInsightsAccessScopesPaginator.ts b/clients/client-ec2/src/pagination/DescribeNetworkInsightsAccessScopesPaginator.ts
index 27a5a185f2bb..3c6af8dc3400 100644
--- a/clients/client-ec2/src/pagination/DescribeNetworkInsightsAccessScopesPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeNetworkInsightsAccessScopesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeNetworkInsightsAccessScopes(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeNetworkInsightsAnalysesPaginator.ts b/clients/client-ec2/src/pagination/DescribeNetworkInsightsAnalysesPaginator.ts
index fbf7cdfc49ea..4404a4a7477e 100644
--- a/clients/client-ec2/src/pagination/DescribeNetworkInsightsAnalysesPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeNetworkInsightsAnalysesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeNetworkInsightsAnalyses(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeNetworkInsightsPathsPaginator.ts b/clients/client-ec2/src/pagination/DescribeNetworkInsightsPathsPaginator.ts
index 1038447aeea6..52e62d1c7d95 100644
--- a/clients/client-ec2/src/pagination/DescribeNetworkInsightsPathsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeNetworkInsightsPathsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeNetworkInsightsPaths(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeNetworkInterfacePermissionsPaginator.ts b/clients/client-ec2/src/pagination/DescribeNetworkInterfacePermissionsPaginator.ts
index e9576daf9eba..0babba29092c 100644
--- a/clients/client-ec2/src/pagination/DescribeNetworkInterfacePermissionsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeNetworkInterfacePermissionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeNetworkInterfacePermissions(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeNetworkInterfacesPaginator.ts b/clients/client-ec2/src/pagination/DescribeNetworkInterfacesPaginator.ts
index 4f0aa63f66dd..72300ee57987 100644
--- a/clients/client-ec2/src/pagination/DescribeNetworkInterfacesPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeNetworkInterfacesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeNetworkInterfaces(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribePrefixListsPaginator.ts b/clients/client-ec2/src/pagination/DescribePrefixListsPaginator.ts
index 8afc5f49e5a1..11d5649ab91d 100644
--- a/clients/client-ec2/src/pagination/DescribePrefixListsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribePrefixListsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribePrefixLists(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribePrincipalIdFormatPaginator.ts b/clients/client-ec2/src/pagination/DescribePrincipalIdFormatPaginator.ts
index 95a6a0026ebd..5afe989490f3 100644
--- a/clients/client-ec2/src/pagination/DescribePrincipalIdFormatPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribePrincipalIdFormatPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribePrincipalIdFormat(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribePublicIpv4PoolsPaginator.ts b/clients/client-ec2/src/pagination/DescribePublicIpv4PoolsPaginator.ts
index 1df97d06dbbc..90cb54975c85 100644
--- a/clients/client-ec2/src/pagination/DescribePublicIpv4PoolsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribePublicIpv4PoolsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribePublicIpv4Pools(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeReplaceRootVolumeTasksPaginator.ts b/clients/client-ec2/src/pagination/DescribeReplaceRootVolumeTasksPaginator.ts
index 111e9b4b09bb..02173ae0f062 100644
--- a/clients/client-ec2/src/pagination/DescribeReplaceRootVolumeTasksPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeReplaceRootVolumeTasksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeReplaceRootVolumeTasks(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeReservedInstancesModificationsPaginator.ts b/clients/client-ec2/src/pagination/DescribeReservedInstancesModificationsPaginator.ts
index 8ec49385a18c..6aa7db116e9d 100644
--- a/clients/client-ec2/src/pagination/DescribeReservedInstancesModificationsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeReservedInstancesModificationsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateDescribeReservedInstancesModifications(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeReservedInstancesOfferingsPaginator.ts b/clients/client-ec2/src/pagination/DescribeReservedInstancesOfferingsPaginator.ts
index 145f52b5a78c..47a9059019db 100644
--- a/clients/client-ec2/src/pagination/DescribeReservedInstancesOfferingsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeReservedInstancesOfferingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeReservedInstancesOfferings(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeRouteTablesPaginator.ts b/clients/client-ec2/src/pagination/DescribeRouteTablesPaginator.ts
index 1cb730bb848d..498221900733 100644
--- a/clients/client-ec2/src/pagination/DescribeRouteTablesPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeRouteTablesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeRouteTables(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeScheduledInstanceAvailabilityPaginator.ts b/clients/client-ec2/src/pagination/DescribeScheduledInstanceAvailabilityPaginator.ts
index aafbe6f4e0d5..e07c08dd1cf5 100644
--- a/clients/client-ec2/src/pagination/DescribeScheduledInstanceAvailabilityPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeScheduledInstanceAvailabilityPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeScheduledInstanceAvailability(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeScheduledInstancesPaginator.ts b/clients/client-ec2/src/pagination/DescribeScheduledInstancesPaginator.ts
index 48ba41b22d8d..b5ef40b37144 100644
--- a/clients/client-ec2/src/pagination/DescribeScheduledInstancesPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeScheduledInstancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeScheduledInstances(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeSecurityGroupRulesPaginator.ts b/clients/client-ec2/src/pagination/DescribeSecurityGroupRulesPaginator.ts
index 0e786a9835c4..c749bc3cc637 100644
--- a/clients/client-ec2/src/pagination/DescribeSecurityGroupRulesPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeSecurityGroupRulesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeSecurityGroupRules(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeSecurityGroupsPaginator.ts b/clients/client-ec2/src/pagination/DescribeSecurityGroupsPaginator.ts
index 344596419b3d..4b92fe14f8fc 100644
--- a/clients/client-ec2/src/pagination/DescribeSecurityGroupsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeSecurityGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeSecurityGroups(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeSnapshotTierStatusPaginator.ts b/clients/client-ec2/src/pagination/DescribeSnapshotTierStatusPaginator.ts
index 7a339b600091..dd385da3ec6c 100644
--- a/clients/client-ec2/src/pagination/DescribeSnapshotTierStatusPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeSnapshotTierStatusPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeSnapshotTierStatus(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeSnapshotsPaginator.ts b/clients/client-ec2/src/pagination/DescribeSnapshotsPaginator.ts
index c0cbc98feb03..6cec16e99ca3 100644
--- a/clients/client-ec2/src/pagination/DescribeSnapshotsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeSnapshotsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeSnapshots(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeSpotFleetRequestsPaginator.ts b/clients/client-ec2/src/pagination/DescribeSpotFleetRequestsPaginator.ts
index 4fdaca41ae83..05f7bb2fa758 100644
--- a/clients/client-ec2/src/pagination/DescribeSpotFleetRequestsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeSpotFleetRequestsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeSpotFleetRequests(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeSpotInstanceRequestsPaginator.ts b/clients/client-ec2/src/pagination/DescribeSpotInstanceRequestsPaginator.ts
index a4e3c72a608e..f50b4ea794c4 100644
--- a/clients/client-ec2/src/pagination/DescribeSpotInstanceRequestsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeSpotInstanceRequestsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeSpotInstanceRequests(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeSpotPriceHistoryPaginator.ts b/clients/client-ec2/src/pagination/DescribeSpotPriceHistoryPaginator.ts
index 9424ae34d5c8..768e25d2ad28 100644
--- a/clients/client-ec2/src/pagination/DescribeSpotPriceHistoryPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeSpotPriceHistoryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeSpotPriceHistory(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeStaleSecurityGroupsPaginator.ts b/clients/client-ec2/src/pagination/DescribeStaleSecurityGroupsPaginator.ts
index 30920a53b411..9d6cbd170173 100644
--- a/clients/client-ec2/src/pagination/DescribeStaleSecurityGroupsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeStaleSecurityGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeStaleSecurityGroups(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeStoreImageTasksPaginator.ts b/clients/client-ec2/src/pagination/DescribeStoreImageTasksPaginator.ts
index b768cc0f9b6f..b4a264e42b37 100644
--- a/clients/client-ec2/src/pagination/DescribeStoreImageTasksPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeStoreImageTasksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeStoreImageTasks(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeSubnetsPaginator.ts b/clients/client-ec2/src/pagination/DescribeSubnetsPaginator.ts
index 2afd14247401..b72c49923a13 100644
--- a/clients/client-ec2/src/pagination/DescribeSubnetsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeSubnetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeSubnets(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeTagsPaginator.ts b/clients/client-ec2/src/pagination/DescribeTagsPaginator.ts
index 4f42cdf133e4..99a9c1ccfe15 100644
--- a/clients/client-ec2/src/pagination/DescribeTagsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeTagsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeTags(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeTrafficMirrorFiltersPaginator.ts b/clients/client-ec2/src/pagination/DescribeTrafficMirrorFiltersPaginator.ts
index 59ea2102f739..93dc21ecc15d 100644
--- a/clients/client-ec2/src/pagination/DescribeTrafficMirrorFiltersPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeTrafficMirrorFiltersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeTrafficMirrorFilters(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeTrafficMirrorSessionsPaginator.ts b/clients/client-ec2/src/pagination/DescribeTrafficMirrorSessionsPaginator.ts
index ec3150925057..d0ac6dfeba91 100644
--- a/clients/client-ec2/src/pagination/DescribeTrafficMirrorSessionsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeTrafficMirrorSessionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeTrafficMirrorSessions(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeTrafficMirrorTargetsPaginator.ts b/clients/client-ec2/src/pagination/DescribeTrafficMirrorTargetsPaginator.ts
index 0ad7c323b4ec..31287f02c95e 100644
--- a/clients/client-ec2/src/pagination/DescribeTrafficMirrorTargetsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeTrafficMirrorTargetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeTrafficMirrorTargets(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeTransitGatewayAttachmentsPaginator.ts b/clients/client-ec2/src/pagination/DescribeTransitGatewayAttachmentsPaginator.ts
index 783d755aad88..f2ab2ca66ec7 100644
--- a/clients/client-ec2/src/pagination/DescribeTransitGatewayAttachmentsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeTransitGatewayAttachmentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeTransitGatewayAttachments(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeTransitGatewayConnectPeersPaginator.ts b/clients/client-ec2/src/pagination/DescribeTransitGatewayConnectPeersPaginator.ts
index cbc9492b701a..2ea8bd5e3d35 100644
--- a/clients/client-ec2/src/pagination/DescribeTransitGatewayConnectPeersPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeTransitGatewayConnectPeersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeTransitGatewayConnectPeers(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeTransitGatewayConnectsPaginator.ts b/clients/client-ec2/src/pagination/DescribeTransitGatewayConnectsPaginator.ts
index 29e4a77e2b44..017f17f3374e 100644
--- a/clients/client-ec2/src/pagination/DescribeTransitGatewayConnectsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeTransitGatewayConnectsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeTransitGatewayConnects(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeTransitGatewayMulticastDomainsPaginator.ts b/clients/client-ec2/src/pagination/DescribeTransitGatewayMulticastDomainsPaginator.ts
index 018625a79b75..498a51024eeb 100644
--- a/clients/client-ec2/src/pagination/DescribeTransitGatewayMulticastDomainsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeTransitGatewayMulticastDomainsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeTransitGatewayMulticastDomains(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeTransitGatewayPeeringAttachmentsPaginator.ts b/clients/client-ec2/src/pagination/DescribeTransitGatewayPeeringAttachmentsPaginator.ts
index 985b5c269ad6..3b26a8a9f6f1 100644
--- a/clients/client-ec2/src/pagination/DescribeTransitGatewayPeeringAttachmentsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeTransitGatewayPeeringAttachmentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeTransitGatewayPeeringAttachments(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeTransitGatewayRouteTablesPaginator.ts b/clients/client-ec2/src/pagination/DescribeTransitGatewayRouteTablesPaginator.ts
index 6bf69d6dee7c..ce3b36f9460b 100644
--- a/clients/client-ec2/src/pagination/DescribeTransitGatewayRouteTablesPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeTransitGatewayRouteTablesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeTransitGatewayRouteTables(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeTransitGatewayVpcAttachmentsPaginator.ts b/clients/client-ec2/src/pagination/DescribeTransitGatewayVpcAttachmentsPaginator.ts
index 797f03b62efe..c0a8bc721544 100644
--- a/clients/client-ec2/src/pagination/DescribeTransitGatewayVpcAttachmentsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeTransitGatewayVpcAttachmentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeTransitGatewayVpcAttachments(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeTransitGatewaysPaginator.ts b/clients/client-ec2/src/pagination/DescribeTransitGatewaysPaginator.ts
index 1c638a4b0959..ddb02cb06bc0 100644
--- a/clients/client-ec2/src/pagination/DescribeTransitGatewaysPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeTransitGatewaysPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeTransitGateways(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeTrunkInterfaceAssociationsPaginator.ts b/clients/client-ec2/src/pagination/DescribeTrunkInterfaceAssociationsPaginator.ts
index 6abdeec619cb..163dc40d9d9e 100644
--- a/clients/client-ec2/src/pagination/DescribeTrunkInterfaceAssociationsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeTrunkInterfaceAssociationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeTrunkInterfaceAssociations(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeVolumeStatusPaginator.ts b/clients/client-ec2/src/pagination/DescribeVolumeStatusPaginator.ts
index 3cd6590d0abe..a04d0c78ca9f 100644
--- a/clients/client-ec2/src/pagination/DescribeVolumeStatusPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeVolumeStatusPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeVolumeStatus(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeVolumesModificationsPaginator.ts b/clients/client-ec2/src/pagination/DescribeVolumesModificationsPaginator.ts
index 34fd02446a2a..d641bcd5aa00 100644
--- a/clients/client-ec2/src/pagination/DescribeVolumesModificationsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeVolumesModificationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeVolumesModifications(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeVolumesPaginator.ts b/clients/client-ec2/src/pagination/DescribeVolumesPaginator.ts
index 168352f67f5a..c87b6db791e5 100644
--- a/clients/client-ec2/src/pagination/DescribeVolumesPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeVolumesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeVolumes(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeVpcClassicLinkDnsSupportPaginator.ts b/clients/client-ec2/src/pagination/DescribeVpcClassicLinkDnsSupportPaginator.ts
index 4b9c288e0521..5678cfd25674 100644
--- a/clients/client-ec2/src/pagination/DescribeVpcClassicLinkDnsSupportPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeVpcClassicLinkDnsSupportPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeVpcClassicLinkDnsSupport(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeVpcEndpointConnectionNotificationsPaginator.ts b/clients/client-ec2/src/pagination/DescribeVpcEndpointConnectionNotificationsPaginator.ts
index faa0b769f661..60407c72f6ed 100644
--- a/clients/client-ec2/src/pagination/DescribeVpcEndpointConnectionNotificationsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeVpcEndpointConnectionNotificationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeVpcEndpointConnectionNotifications(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeVpcEndpointConnectionsPaginator.ts b/clients/client-ec2/src/pagination/DescribeVpcEndpointConnectionsPaginator.ts
index 9cb4889f71cb..77af99776108 100644
--- a/clients/client-ec2/src/pagination/DescribeVpcEndpointConnectionsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeVpcEndpointConnectionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeVpcEndpointConnections(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeVpcEndpointServiceConfigurationsPaginator.ts b/clients/client-ec2/src/pagination/DescribeVpcEndpointServiceConfigurationsPaginator.ts
index 33c9d62a005a..ba79c6338c60 100644
--- a/clients/client-ec2/src/pagination/DescribeVpcEndpointServiceConfigurationsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeVpcEndpointServiceConfigurationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeVpcEndpointServiceConfigurations(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeVpcEndpointServicePermissionsPaginator.ts b/clients/client-ec2/src/pagination/DescribeVpcEndpointServicePermissionsPaginator.ts
index f4bc73e52c04..eb6f0e5cba01 100644
--- a/clients/client-ec2/src/pagination/DescribeVpcEndpointServicePermissionsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeVpcEndpointServicePermissionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeVpcEndpointServicePermissions(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeVpcEndpointsPaginator.ts b/clients/client-ec2/src/pagination/DescribeVpcEndpointsPaginator.ts
index 1a5961552e13..15c5d4f07c28 100644
--- a/clients/client-ec2/src/pagination/DescribeVpcEndpointsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeVpcEndpointsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeVpcEndpoints(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeVpcPeeringConnectionsPaginator.ts b/clients/client-ec2/src/pagination/DescribeVpcPeeringConnectionsPaginator.ts
index 59917daedb4f..ef9caa845fa5 100644
--- a/clients/client-ec2/src/pagination/DescribeVpcPeeringConnectionsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeVpcPeeringConnectionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeVpcPeeringConnections(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/DescribeVpcsPaginator.ts b/clients/client-ec2/src/pagination/DescribeVpcsPaginator.ts
index e635293a2588..96b9e1c9e357 100644
--- a/clients/client-ec2/src/pagination/DescribeVpcsPaginator.ts
+++ b/clients/client-ec2/src/pagination/DescribeVpcsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeVpcs(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/GetAssociatedIpv6PoolCidrsPaginator.ts b/clients/client-ec2/src/pagination/GetAssociatedIpv6PoolCidrsPaginator.ts
index 044f312f6188..d645775ec6fb 100644
--- a/clients/client-ec2/src/pagination/GetAssociatedIpv6PoolCidrsPaginator.ts
+++ b/clients/client-ec2/src/pagination/GetAssociatedIpv6PoolCidrsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetAssociatedIpv6PoolCidrs(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/GetGroupsForCapacityReservationPaginator.ts b/clients/client-ec2/src/pagination/GetGroupsForCapacityReservationPaginator.ts
index eb7fbdc25d19..8b9a8ea27484 100644
--- a/clients/client-ec2/src/pagination/GetGroupsForCapacityReservationPaginator.ts
+++ b/clients/client-ec2/src/pagination/GetGroupsForCapacityReservationPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetGroupsForCapacityReservation(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/GetInstanceTypesFromInstanceRequirementsPaginator.ts b/clients/client-ec2/src/pagination/GetInstanceTypesFromInstanceRequirementsPaginator.ts
index 25a61cbb6165..56b625ae39a3 100644
--- a/clients/client-ec2/src/pagination/GetInstanceTypesFromInstanceRequirementsPaginator.ts
+++ b/clients/client-ec2/src/pagination/GetInstanceTypesFromInstanceRequirementsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetInstanceTypesFromInstanceRequirements(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/GetIpamAddressHistoryPaginator.ts b/clients/client-ec2/src/pagination/GetIpamAddressHistoryPaginator.ts
index c003c6e7d283..b4256cb4c962 100644
--- a/clients/client-ec2/src/pagination/GetIpamAddressHistoryPaginator.ts
+++ b/clients/client-ec2/src/pagination/GetIpamAddressHistoryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetIpamAddressHistory(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/GetIpamPoolAllocationsPaginator.ts b/clients/client-ec2/src/pagination/GetIpamPoolAllocationsPaginator.ts
index e778e94ff263..06f9df1b4ccd 100644
--- a/clients/client-ec2/src/pagination/GetIpamPoolAllocationsPaginator.ts
+++ b/clients/client-ec2/src/pagination/GetIpamPoolAllocationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetIpamPoolAllocations(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/GetIpamPoolCidrsPaginator.ts b/clients/client-ec2/src/pagination/GetIpamPoolCidrsPaginator.ts
index 9b85cdd96118..8009fbb8b865 100644
--- a/clients/client-ec2/src/pagination/GetIpamPoolCidrsPaginator.ts
+++ b/clients/client-ec2/src/pagination/GetIpamPoolCidrsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetIpamPoolCidrs(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/GetIpamResourceCidrsPaginator.ts b/clients/client-ec2/src/pagination/GetIpamResourceCidrsPaginator.ts
index 2ede3d6fa32c..eefefd6eb51c 100644
--- a/clients/client-ec2/src/pagination/GetIpamResourceCidrsPaginator.ts
+++ b/clients/client-ec2/src/pagination/GetIpamResourceCidrsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetIpamResourceCidrs(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/GetManagedPrefixListAssociationsPaginator.ts b/clients/client-ec2/src/pagination/GetManagedPrefixListAssociationsPaginator.ts
index 384d7986e017..3e92d30f4d75 100644
--- a/clients/client-ec2/src/pagination/GetManagedPrefixListAssociationsPaginator.ts
+++ b/clients/client-ec2/src/pagination/GetManagedPrefixListAssociationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetManagedPrefixListAssociations(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/GetManagedPrefixListEntriesPaginator.ts b/clients/client-ec2/src/pagination/GetManagedPrefixListEntriesPaginator.ts
index ee200632103b..945b713f1396 100644
--- a/clients/client-ec2/src/pagination/GetManagedPrefixListEntriesPaginator.ts
+++ b/clients/client-ec2/src/pagination/GetManagedPrefixListEntriesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetManagedPrefixListEntries(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/GetSpotPlacementScoresPaginator.ts b/clients/client-ec2/src/pagination/GetSpotPlacementScoresPaginator.ts
index 8fdcc8e7b451..d6e2eeb6dc0e 100644
--- a/clients/client-ec2/src/pagination/GetSpotPlacementScoresPaginator.ts
+++ b/clients/client-ec2/src/pagination/GetSpotPlacementScoresPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetSpotPlacementScores(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/GetTransitGatewayAttachmentPropagationsPaginator.ts b/clients/client-ec2/src/pagination/GetTransitGatewayAttachmentPropagationsPaginator.ts
index 4656c0f633bc..b560e936bf6b 100644
--- a/clients/client-ec2/src/pagination/GetTransitGatewayAttachmentPropagationsPaginator.ts
+++ b/clients/client-ec2/src/pagination/GetTransitGatewayAttachmentPropagationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetTransitGatewayAttachmentPropagations(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/GetTransitGatewayMulticastDomainAssociationsPaginator.ts b/clients/client-ec2/src/pagination/GetTransitGatewayMulticastDomainAssociationsPaginator.ts
index ae507c3ebe72..2bb75b1641c9 100644
--- a/clients/client-ec2/src/pagination/GetTransitGatewayMulticastDomainAssociationsPaginator.ts
+++ b/clients/client-ec2/src/pagination/GetTransitGatewayMulticastDomainAssociationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetTransitGatewayMulticastDomainAssociations(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/GetTransitGatewayPrefixListReferencesPaginator.ts b/clients/client-ec2/src/pagination/GetTransitGatewayPrefixListReferencesPaginator.ts
index fde342d7228b..bb1bf7ce718b 100644
--- a/clients/client-ec2/src/pagination/GetTransitGatewayPrefixListReferencesPaginator.ts
+++ b/clients/client-ec2/src/pagination/GetTransitGatewayPrefixListReferencesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetTransitGatewayPrefixListReferences(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/GetTransitGatewayRouteTableAssociationsPaginator.ts b/clients/client-ec2/src/pagination/GetTransitGatewayRouteTableAssociationsPaginator.ts
index 7fa95488f124..982821e86e81 100644
--- a/clients/client-ec2/src/pagination/GetTransitGatewayRouteTableAssociationsPaginator.ts
+++ b/clients/client-ec2/src/pagination/GetTransitGatewayRouteTableAssociationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetTransitGatewayRouteTableAssociations(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/GetTransitGatewayRouteTablePropagationsPaginator.ts b/clients/client-ec2/src/pagination/GetTransitGatewayRouteTablePropagationsPaginator.ts
index 756094e295af..715a94eaceee 100644
--- a/clients/client-ec2/src/pagination/GetTransitGatewayRouteTablePropagationsPaginator.ts
+++ b/clients/client-ec2/src/pagination/GetTransitGatewayRouteTablePropagationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetTransitGatewayRouteTablePropagations(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/GetVpnConnectionDeviceTypesPaginator.ts b/clients/client-ec2/src/pagination/GetVpnConnectionDeviceTypesPaginator.ts
index 98e20d314179..1b4618ebb477 100644
--- a/clients/client-ec2/src/pagination/GetVpnConnectionDeviceTypesPaginator.ts
+++ b/clients/client-ec2/src/pagination/GetVpnConnectionDeviceTypesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetVpnConnectionDeviceTypes(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/ListImagesInRecycleBinPaginator.ts b/clients/client-ec2/src/pagination/ListImagesInRecycleBinPaginator.ts
index 3f2cb556ad7c..d35de0a578d3 100644
--- a/clients/client-ec2/src/pagination/ListImagesInRecycleBinPaginator.ts
+++ b/clients/client-ec2/src/pagination/ListImagesInRecycleBinPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListImagesInRecycleBin(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/ListSnapshotsInRecycleBinPaginator.ts b/clients/client-ec2/src/pagination/ListSnapshotsInRecycleBinPaginator.ts
index c54466edbd6a..693665f0e147 100644
--- a/clients/client-ec2/src/pagination/ListSnapshotsInRecycleBinPaginator.ts
+++ b/clients/client-ec2/src/pagination/ListSnapshotsInRecycleBinPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSnapshotsInRecycleBin(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/SearchLocalGatewayRoutesPaginator.ts b/clients/client-ec2/src/pagination/SearchLocalGatewayRoutesPaginator.ts
index ba7cf105d5b7..d16a59e1d19f 100644
--- a/clients/client-ec2/src/pagination/SearchLocalGatewayRoutesPaginator.ts
+++ b/clients/client-ec2/src/pagination/SearchLocalGatewayRoutesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchLocalGatewayRoutes(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ec2/src/pagination/SearchTransitGatewayMulticastGroupsPaginator.ts b/clients/client-ec2/src/pagination/SearchTransitGatewayMulticastGroupsPaginator.ts
index 5f8d4ebd86e9..09831cc63a83 100644
--- a/clients/client-ec2/src/pagination/SearchTransitGatewayMulticastGroupsPaginator.ts
+++ b/clients/client-ec2/src/pagination/SearchTransitGatewayMulticastGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchTransitGatewayMulticastGroups(
       throw new Error("Invalid client, expected EC2 | EC2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ecr-public/src/pagination/DescribeImageTagsPaginator.ts b/clients/client-ecr-public/src/pagination/DescribeImageTagsPaginator.ts
index 3da3b77ace14..a677ec679acc 100644
--- a/clients/client-ecr-public/src/pagination/DescribeImageTagsPaginator.ts
+++ b/clients/client-ecr-public/src/pagination/DescribeImageTagsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeImageTags(
       throw new Error("Invalid client, expected ECRPUBLIC | ECRPUBLICClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ecr-public/src/pagination/DescribeImagesPaginator.ts b/clients/client-ecr-public/src/pagination/DescribeImagesPaginator.ts
index ebcfd4431f74..551b6df04adc 100644
--- a/clients/client-ecr-public/src/pagination/DescribeImagesPaginator.ts
+++ b/clients/client-ecr-public/src/pagination/DescribeImagesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeImages(
       throw new Error("Invalid client, expected ECRPUBLIC | ECRPUBLICClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ecr-public/src/pagination/DescribeRegistriesPaginator.ts b/clients/client-ecr-public/src/pagination/DescribeRegistriesPaginator.ts
index 6927dc7374d4..576be59c0489 100644
--- a/clients/client-ecr-public/src/pagination/DescribeRegistriesPaginator.ts
+++ b/clients/client-ecr-public/src/pagination/DescribeRegistriesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeRegistries(
       throw new Error("Invalid client, expected ECRPUBLIC | ECRPUBLICClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ecr-public/src/pagination/DescribeRepositoriesPaginator.ts b/clients/client-ecr-public/src/pagination/DescribeRepositoriesPaginator.ts
index a24cd5fb7fea..830244b3a7d2 100644
--- a/clients/client-ecr-public/src/pagination/DescribeRepositoriesPaginator.ts
+++ b/clients/client-ecr-public/src/pagination/DescribeRepositoriesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeRepositories(
       throw new Error("Invalid client, expected ECRPUBLIC | ECRPUBLICClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ecr/src/pagination/DescribeImageScanFindingsPaginator.ts b/clients/client-ecr/src/pagination/DescribeImageScanFindingsPaginator.ts
index a9bdc30b81df..0c27e9c9e238 100644
--- a/clients/client-ecr/src/pagination/DescribeImageScanFindingsPaginator.ts
+++ b/clients/client-ecr/src/pagination/DescribeImageScanFindingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeImageScanFindings(
       throw new Error("Invalid client, expected ECR | ECRClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ecr/src/pagination/DescribeImagesPaginator.ts b/clients/client-ecr/src/pagination/DescribeImagesPaginator.ts
index 374c91f6aad2..082e42e34fbd 100644
--- a/clients/client-ecr/src/pagination/DescribeImagesPaginator.ts
+++ b/clients/client-ecr/src/pagination/DescribeImagesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeImages(
       throw new Error("Invalid client, expected ECR | ECRClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ecr/src/pagination/DescribePullThroughCacheRulesPaginator.ts b/clients/client-ecr/src/pagination/DescribePullThroughCacheRulesPaginator.ts
index 89ad7da049d3..7a0e83de48b8 100644
--- a/clients/client-ecr/src/pagination/DescribePullThroughCacheRulesPaginator.ts
+++ b/clients/client-ecr/src/pagination/DescribePullThroughCacheRulesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribePullThroughCacheRules(
       throw new Error("Invalid client, expected ECR | ECRClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ecr/src/pagination/DescribeRepositoriesPaginator.ts b/clients/client-ecr/src/pagination/DescribeRepositoriesPaginator.ts
index b17eb2c7e9c3..83a18fab906d 100644
--- a/clients/client-ecr/src/pagination/DescribeRepositoriesPaginator.ts
+++ b/clients/client-ecr/src/pagination/DescribeRepositoriesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeRepositories(
       throw new Error("Invalid client, expected ECR | ECRClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ecr/src/pagination/GetLifecyclePolicyPreviewPaginator.ts b/clients/client-ecr/src/pagination/GetLifecyclePolicyPreviewPaginator.ts
index b85420205c55..80834a89725c 100644
--- a/clients/client-ecr/src/pagination/GetLifecyclePolicyPreviewPaginator.ts
+++ b/clients/client-ecr/src/pagination/GetLifecyclePolicyPreviewPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetLifecyclePolicyPreview(
       throw new Error("Invalid client, expected ECR | ECRClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ecr/src/pagination/ListImagesPaginator.ts b/clients/client-ecr/src/pagination/ListImagesPaginator.ts
index 0eec2ab8ec07..05b9448c6cdb 100644
--- a/clients/client-ecr/src/pagination/ListImagesPaginator.ts
+++ b/clients/client-ecr/src/pagination/ListImagesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListImages(
       throw new Error("Invalid client, expected ECR | ECRClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ecs/src/pagination/ListAccountSettingsPaginator.ts b/clients/client-ecs/src/pagination/ListAccountSettingsPaginator.ts
index fd4660121c98..7c90290560f0 100644
--- a/clients/client-ecs/src/pagination/ListAccountSettingsPaginator.ts
+++ b/clients/client-ecs/src/pagination/ListAccountSettingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAccountSettings(
       throw new Error("Invalid client, expected ECS | ECSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ecs/src/pagination/ListAttributesPaginator.ts b/clients/client-ecs/src/pagination/ListAttributesPaginator.ts
index 3f1a4e99d64b..dab64ea6e65f 100644
--- a/clients/client-ecs/src/pagination/ListAttributesPaginator.ts
+++ b/clients/client-ecs/src/pagination/ListAttributesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAttributes(
       throw new Error("Invalid client, expected ECS | ECSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ecs/src/pagination/ListClustersPaginator.ts b/clients/client-ecs/src/pagination/ListClustersPaginator.ts
index 02ad95e360dd..7205a74ef125 100644
--- a/clients/client-ecs/src/pagination/ListClustersPaginator.ts
+++ b/clients/client-ecs/src/pagination/ListClustersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListClusters(
       throw new Error("Invalid client, expected ECS | ECSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ecs/src/pagination/ListContainerInstancesPaginator.ts b/clients/client-ecs/src/pagination/ListContainerInstancesPaginator.ts
index 442be7844595..9b250d7d9d49 100644
--- a/clients/client-ecs/src/pagination/ListContainerInstancesPaginator.ts
+++ b/clients/client-ecs/src/pagination/ListContainerInstancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListContainerInstances(
       throw new Error("Invalid client, expected ECS | ECSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ecs/src/pagination/ListServicesPaginator.ts b/clients/client-ecs/src/pagination/ListServicesPaginator.ts
index 790cabab105b..bedbb14db650 100644
--- a/clients/client-ecs/src/pagination/ListServicesPaginator.ts
+++ b/clients/client-ecs/src/pagination/ListServicesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListServices(
       throw new Error("Invalid client, expected ECS | ECSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ecs/src/pagination/ListTaskDefinitionFamiliesPaginator.ts b/clients/client-ecs/src/pagination/ListTaskDefinitionFamiliesPaginator.ts
index 75c6527f6d87..0287d9e8c65c 100644
--- a/clients/client-ecs/src/pagination/ListTaskDefinitionFamiliesPaginator.ts
+++ b/clients/client-ecs/src/pagination/ListTaskDefinitionFamiliesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTaskDefinitionFamilies(
       throw new Error("Invalid client, expected ECS | ECSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ecs/src/pagination/ListTaskDefinitionsPaginator.ts b/clients/client-ecs/src/pagination/ListTaskDefinitionsPaginator.ts
index 6b5e4863f814..f148720fb3e8 100644
--- a/clients/client-ecs/src/pagination/ListTaskDefinitionsPaginator.ts
+++ b/clients/client-ecs/src/pagination/ListTaskDefinitionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTaskDefinitions(
       throw new Error("Invalid client, expected ECS | ECSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ecs/src/pagination/ListTasksPaginator.ts b/clients/client-ecs/src/pagination/ListTasksPaginator.ts
index 0635e3a467df..9eb19e8b0fe4 100644
--- a/clients/client-ecs/src/pagination/ListTasksPaginator.ts
+++ b/clients/client-ecs/src/pagination/ListTasksPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListTasks(
       throw new Error("Invalid client, expected ECS | ECSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-efs/src/pagination/DescribeAccessPointsPaginator.ts b/clients/client-efs/src/pagination/DescribeAccessPointsPaginator.ts
index 9bc2d8e65a35..7efd7a844731 100644
--- a/clients/client-efs/src/pagination/DescribeAccessPointsPaginator.ts
+++ b/clients/client-efs/src/pagination/DescribeAccessPointsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeAccessPoints(
       throw new Error("Invalid client, expected EFS | EFSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-efs/src/pagination/DescribeFileSystemsPaginator.ts b/clients/client-efs/src/pagination/DescribeFileSystemsPaginator.ts
index a02edd177f9f..d7fc395ba89b 100644
--- a/clients/client-efs/src/pagination/DescribeFileSystemsPaginator.ts
+++ b/clients/client-efs/src/pagination/DescribeFileSystemsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeFileSystems(
       throw new Error("Invalid client, expected EFS | EFSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-efs/src/pagination/DescribeTagsPaginator.ts b/clients/client-efs/src/pagination/DescribeTagsPaginator.ts
index b80bb07de9b5..9a8b3216f9d9 100644
--- a/clients/client-efs/src/pagination/DescribeTagsPaginator.ts
+++ b/clients/client-efs/src/pagination/DescribeTagsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeTags(
       throw new Error("Invalid client, expected EFS | EFSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-efs/src/pagination/ListTagsForResourcePaginator.ts b/clients/client-efs/src/pagination/ListTagsForResourcePaginator.ts
index eefd645f9b82..b87970566d98 100644
--- a/clients/client-efs/src/pagination/ListTagsForResourcePaginator.ts
+++ b/clients/client-efs/src/pagination/ListTagsForResourcePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTagsForResource(
       throw new Error("Invalid client, expected EFS | EFSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-eks/src/pagination/DescribeAddonVersionsPaginator.ts b/clients/client-eks/src/pagination/DescribeAddonVersionsPaginator.ts
index c3523eec3d93..a90fa1f6c4d6 100644
--- a/clients/client-eks/src/pagination/DescribeAddonVersionsPaginator.ts
+++ b/clients/client-eks/src/pagination/DescribeAddonVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeAddonVersions(
       throw new Error("Invalid client, expected EKS | EKSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-eks/src/pagination/ListAddonsPaginator.ts b/clients/client-eks/src/pagination/ListAddonsPaginator.ts
index 36282a2bc392..2519cd91f3e5 100644
--- a/clients/client-eks/src/pagination/ListAddonsPaginator.ts
+++ b/clients/client-eks/src/pagination/ListAddonsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListAddons(
       throw new Error("Invalid client, expected EKS | EKSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-eks/src/pagination/ListClustersPaginator.ts b/clients/client-eks/src/pagination/ListClustersPaginator.ts
index 91460f1fce9a..8545c1eda7d7 100644
--- a/clients/client-eks/src/pagination/ListClustersPaginator.ts
+++ b/clients/client-eks/src/pagination/ListClustersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListClusters(
       throw new Error("Invalid client, expected EKS | EKSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-eks/src/pagination/ListFargateProfilesPaginator.ts b/clients/client-eks/src/pagination/ListFargateProfilesPaginator.ts
index 42b31709a33b..fa36d5f64c25 100644
--- a/clients/client-eks/src/pagination/ListFargateProfilesPaginator.ts
+++ b/clients/client-eks/src/pagination/ListFargateProfilesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFargateProfiles(
       throw new Error("Invalid client, expected EKS | EKSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-eks/src/pagination/ListIdentityProviderConfigsPaginator.ts b/clients/client-eks/src/pagination/ListIdentityProviderConfigsPaginator.ts
index 4f2f0d5fb95e..4059c1b12bcc 100644
--- a/clients/client-eks/src/pagination/ListIdentityProviderConfigsPaginator.ts
+++ b/clients/client-eks/src/pagination/ListIdentityProviderConfigsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListIdentityProviderConfigs(
       throw new Error("Invalid client, expected EKS | EKSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-eks/src/pagination/ListNodegroupsPaginator.ts b/clients/client-eks/src/pagination/ListNodegroupsPaginator.ts
index 912956ca3e36..8cc830b65046 100644
--- a/clients/client-eks/src/pagination/ListNodegroupsPaginator.ts
+++ b/clients/client-eks/src/pagination/ListNodegroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListNodegroups(
       throw new Error("Invalid client, expected EKS | EKSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-eks/src/pagination/ListUpdatesPaginator.ts b/clients/client-eks/src/pagination/ListUpdatesPaginator.ts
index a9da4febce9e..7d05b995d23b 100644
--- a/clients/client-eks/src/pagination/ListUpdatesPaginator.ts
+++ b/clients/client-eks/src/pagination/ListUpdatesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListUpdates(
       throw new Error("Invalid client, expected EKS | EKSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elastic-beanstalk/src/pagination/DescribeEnvironmentManagedActionHistoryPaginator.ts b/clients/client-elastic-beanstalk/src/pagination/DescribeEnvironmentManagedActionHistoryPaginator.ts
index c3b293de47ec..ce292f43b1ef 100644
--- a/clients/client-elastic-beanstalk/src/pagination/DescribeEnvironmentManagedActionHistoryPaginator.ts
+++ b/clients/client-elastic-beanstalk/src/pagination/DescribeEnvironmentManagedActionHistoryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEnvironmentManagedActionHistory(
       throw new Error("Invalid client, expected ElasticBeanstalk | ElasticBeanstalkClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elastic-beanstalk/src/pagination/DescribeEventsPaginator.ts b/clients/client-elastic-beanstalk/src/pagination/DescribeEventsPaginator.ts
index 9c408b7b9bb4..cd28d7b4ba9c 100644
--- a/clients/client-elastic-beanstalk/src/pagination/DescribeEventsPaginator.ts
+++ b/clients/client-elastic-beanstalk/src/pagination/DescribeEventsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEvents(
       throw new Error("Invalid client, expected ElasticBeanstalk | ElasticBeanstalkClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elastic-beanstalk/src/pagination/ListPlatformBranchesPaginator.ts b/clients/client-elastic-beanstalk/src/pagination/ListPlatformBranchesPaginator.ts
index 6c80fe0b5510..9a74e02b3a35 100644
--- a/clients/client-elastic-beanstalk/src/pagination/ListPlatformBranchesPaginator.ts
+++ b/clients/client-elastic-beanstalk/src/pagination/ListPlatformBranchesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPlatformBranches(
       throw new Error("Invalid client, expected ElasticBeanstalk | ElasticBeanstalkClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elastic-beanstalk/src/pagination/ListPlatformVersionsPaginator.ts b/clients/client-elastic-beanstalk/src/pagination/ListPlatformVersionsPaginator.ts
index 50dd0145ead2..a0267d732f48 100644
--- a/clients/client-elastic-beanstalk/src/pagination/ListPlatformVersionsPaginator.ts
+++ b/clients/client-elastic-beanstalk/src/pagination/ListPlatformVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPlatformVersions(
       throw new Error("Invalid client, expected ElasticBeanstalk | ElasticBeanstalkClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elastic-inference/src/pagination/DescribeAcceleratorsPaginator.ts b/clients/client-elastic-inference/src/pagination/DescribeAcceleratorsPaginator.ts
index 8c6d8b95e5df..9aae41df3794 100644
--- a/clients/client-elastic-inference/src/pagination/DescribeAcceleratorsPaginator.ts
+++ b/clients/client-elastic-inference/src/pagination/DescribeAcceleratorsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeAccelerators(
       throw new Error("Invalid client, expected ElasticInference | ElasticInferenceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elastic-load-balancing-v2/src/pagination/DescribeListenersPaginator.ts b/clients/client-elastic-load-balancing-v2/src/pagination/DescribeListenersPaginator.ts
index d135d9bcd6f9..a3e450e902c1 100644
--- a/clients/client-elastic-load-balancing-v2/src/pagination/DescribeListenersPaginator.ts
+++ b/clients/client-elastic-load-balancing-v2/src/pagination/DescribeListenersPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateDescribeListeners(
       throw new Error("Invalid client, expected ElasticLoadBalancingV2 | ElasticLoadBalancingV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elastic-load-balancing-v2/src/pagination/DescribeLoadBalancersPaginator.ts b/clients/client-elastic-load-balancing-v2/src/pagination/DescribeLoadBalancersPaginator.ts
index 2fba7dc69054..623085113f15 100644
--- a/clients/client-elastic-load-balancing-v2/src/pagination/DescribeLoadBalancersPaginator.ts
+++ b/clients/client-elastic-load-balancing-v2/src/pagination/DescribeLoadBalancersPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateDescribeLoadBalancers(
       throw new Error("Invalid client, expected ElasticLoadBalancingV2 | ElasticLoadBalancingV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elastic-load-balancing-v2/src/pagination/DescribeTargetGroupsPaginator.ts b/clients/client-elastic-load-balancing-v2/src/pagination/DescribeTargetGroupsPaginator.ts
index 5697297e89f9..ba7bdafaaa54 100644
--- a/clients/client-elastic-load-balancing-v2/src/pagination/DescribeTargetGroupsPaginator.ts
+++ b/clients/client-elastic-load-balancing-v2/src/pagination/DescribeTargetGroupsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateDescribeTargetGroups(
       throw new Error("Invalid client, expected ElasticLoadBalancingV2 | ElasticLoadBalancingV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elastic-load-balancing/src/pagination/DescribeLoadBalancersPaginator.ts b/clients/client-elastic-load-balancing/src/pagination/DescribeLoadBalancersPaginator.ts
index 6339fd7646b2..9a50df5d71d4 100644
--- a/clients/client-elastic-load-balancing/src/pagination/DescribeLoadBalancersPaginator.ts
+++ b/clients/client-elastic-load-balancing/src/pagination/DescribeLoadBalancersPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateDescribeLoadBalancers(
       throw new Error("Invalid client, expected ElasticLoadBalancing | ElasticLoadBalancingClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elastic-transcoder/src/pagination/ListJobsByPipelinePaginator.ts b/clients/client-elastic-transcoder/src/pagination/ListJobsByPipelinePaginator.ts
index 617259be7323..0bf7310a8e07 100644
--- a/clients/client-elastic-transcoder/src/pagination/ListJobsByPipelinePaginator.ts
+++ b/clients/client-elastic-transcoder/src/pagination/ListJobsByPipelinePaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListJobsByPipeline(
       throw new Error("Invalid client, expected ElasticTranscoder | ElasticTranscoderClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextPageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elastic-transcoder/src/pagination/ListJobsByStatusPaginator.ts b/clients/client-elastic-transcoder/src/pagination/ListJobsByStatusPaginator.ts
index 5d159ff4ea14..ec72bad8aa66 100644
--- a/clients/client-elastic-transcoder/src/pagination/ListJobsByStatusPaginator.ts
+++ b/clients/client-elastic-transcoder/src/pagination/ListJobsByStatusPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListJobsByStatus(
       throw new Error("Invalid client, expected ElasticTranscoder | ElasticTranscoderClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextPageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elastic-transcoder/src/pagination/ListPipelinesPaginator.ts b/clients/client-elastic-transcoder/src/pagination/ListPipelinesPaginator.ts
index affccbc7e5c7..aaa6ce3a659b 100644
--- a/clients/client-elastic-transcoder/src/pagination/ListPipelinesPaginator.ts
+++ b/clients/client-elastic-transcoder/src/pagination/ListPipelinesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListPipelines(
       throw new Error("Invalid client, expected ElasticTranscoder | ElasticTranscoderClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextPageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elastic-transcoder/src/pagination/ListPresetsPaginator.ts b/clients/client-elastic-transcoder/src/pagination/ListPresetsPaginator.ts
index a325ae8396a3..2815780e8144 100644
--- a/clients/client-elastic-transcoder/src/pagination/ListPresetsPaginator.ts
+++ b/clients/client-elastic-transcoder/src/pagination/ListPresetsPaginator.ts
@@ -46,8 +46,9 @@ export async function* paginateListPresets(
       throw new Error("Invalid client, expected ElasticTranscoder | ElasticTranscoderClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextPageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticache/src/pagination/DescribeCacheClustersPaginator.ts b/clients/client-elasticache/src/pagination/DescribeCacheClustersPaginator.ts
index 6b3029a42ab8..610bad15784c 100644
--- a/clients/client-elasticache/src/pagination/DescribeCacheClustersPaginator.ts
+++ b/clients/client-elasticache/src/pagination/DescribeCacheClustersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeCacheClusters(
       throw new Error("Invalid client, expected ElastiCache | ElastiCacheClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticache/src/pagination/DescribeCacheEngineVersionsPaginator.ts b/clients/client-elasticache/src/pagination/DescribeCacheEngineVersionsPaginator.ts
index ac7d17c30be8..53695e89479a 100644
--- a/clients/client-elasticache/src/pagination/DescribeCacheEngineVersionsPaginator.ts
+++ b/clients/client-elasticache/src/pagination/DescribeCacheEngineVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeCacheEngineVersions(
       throw new Error("Invalid client, expected ElastiCache | ElastiCacheClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticache/src/pagination/DescribeCacheParameterGroupsPaginator.ts b/clients/client-elasticache/src/pagination/DescribeCacheParameterGroupsPaginator.ts
index b3448a517832..9d319da6fe5c 100644
--- a/clients/client-elasticache/src/pagination/DescribeCacheParameterGroupsPaginator.ts
+++ b/clients/client-elasticache/src/pagination/DescribeCacheParameterGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeCacheParameterGroups(
       throw new Error("Invalid client, expected ElastiCache | ElastiCacheClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticache/src/pagination/DescribeCacheParametersPaginator.ts b/clients/client-elasticache/src/pagination/DescribeCacheParametersPaginator.ts
index 5ea57945927a..d11df364605b 100644
--- a/clients/client-elasticache/src/pagination/DescribeCacheParametersPaginator.ts
+++ b/clients/client-elasticache/src/pagination/DescribeCacheParametersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeCacheParameters(
       throw new Error("Invalid client, expected ElastiCache | ElastiCacheClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticache/src/pagination/DescribeCacheSecurityGroupsPaginator.ts b/clients/client-elasticache/src/pagination/DescribeCacheSecurityGroupsPaginator.ts
index 2481f2b33154..9eec54375aee 100644
--- a/clients/client-elasticache/src/pagination/DescribeCacheSecurityGroupsPaginator.ts
+++ b/clients/client-elasticache/src/pagination/DescribeCacheSecurityGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeCacheSecurityGroups(
       throw new Error("Invalid client, expected ElastiCache | ElastiCacheClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticache/src/pagination/DescribeCacheSubnetGroupsPaginator.ts b/clients/client-elasticache/src/pagination/DescribeCacheSubnetGroupsPaginator.ts
index ffd542e3b65f..7f5b8b785e34 100644
--- a/clients/client-elasticache/src/pagination/DescribeCacheSubnetGroupsPaginator.ts
+++ b/clients/client-elasticache/src/pagination/DescribeCacheSubnetGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeCacheSubnetGroups(
       throw new Error("Invalid client, expected ElastiCache | ElastiCacheClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticache/src/pagination/DescribeEngineDefaultParametersPaginator.ts b/clients/client-elasticache/src/pagination/DescribeEngineDefaultParametersPaginator.ts
index 772173117d34..8d07fb5a86c4 100644
--- a/clients/client-elasticache/src/pagination/DescribeEngineDefaultParametersPaginator.ts
+++ b/clients/client-elasticache/src/pagination/DescribeEngineDefaultParametersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEngineDefaultParameters(
       throw new Error("Invalid client, expected ElastiCache | ElastiCacheClient");
     }
     yield page;
+    const prevToken = token;
     token = page.EngineDefaults!.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticache/src/pagination/DescribeEventsPaginator.ts b/clients/client-elasticache/src/pagination/DescribeEventsPaginator.ts
index 66b44b978b96..b78c4e3a2c8b 100644
--- a/clients/client-elasticache/src/pagination/DescribeEventsPaginator.ts
+++ b/clients/client-elasticache/src/pagination/DescribeEventsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEvents(
       throw new Error("Invalid client, expected ElastiCache | ElastiCacheClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticache/src/pagination/DescribeGlobalReplicationGroupsPaginator.ts b/clients/client-elasticache/src/pagination/DescribeGlobalReplicationGroupsPaginator.ts
index 4132881e6ec9..b4a342562be2 100644
--- a/clients/client-elasticache/src/pagination/DescribeGlobalReplicationGroupsPaginator.ts
+++ b/clients/client-elasticache/src/pagination/DescribeGlobalReplicationGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeGlobalReplicationGroups(
       throw new Error("Invalid client, expected ElastiCache | ElastiCacheClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticache/src/pagination/DescribeReplicationGroupsPaginator.ts b/clients/client-elasticache/src/pagination/DescribeReplicationGroupsPaginator.ts
index 1b610f12a973..ca50e385ffc3 100644
--- a/clients/client-elasticache/src/pagination/DescribeReplicationGroupsPaginator.ts
+++ b/clients/client-elasticache/src/pagination/DescribeReplicationGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeReplicationGroups(
       throw new Error("Invalid client, expected ElastiCache | ElastiCacheClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticache/src/pagination/DescribeReservedCacheNodesOfferingsPaginator.ts b/clients/client-elasticache/src/pagination/DescribeReservedCacheNodesOfferingsPaginator.ts
index 4733a5235c85..5790b07b6f4e 100644
--- a/clients/client-elasticache/src/pagination/DescribeReservedCacheNodesOfferingsPaginator.ts
+++ b/clients/client-elasticache/src/pagination/DescribeReservedCacheNodesOfferingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeReservedCacheNodesOfferings(
       throw new Error("Invalid client, expected ElastiCache | ElastiCacheClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticache/src/pagination/DescribeReservedCacheNodesPaginator.ts b/clients/client-elasticache/src/pagination/DescribeReservedCacheNodesPaginator.ts
index 385ab5374d75..b6db33faf84b 100644
--- a/clients/client-elasticache/src/pagination/DescribeReservedCacheNodesPaginator.ts
+++ b/clients/client-elasticache/src/pagination/DescribeReservedCacheNodesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeReservedCacheNodes(
       throw new Error("Invalid client, expected ElastiCache | ElastiCacheClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticache/src/pagination/DescribeServiceUpdatesPaginator.ts b/clients/client-elasticache/src/pagination/DescribeServiceUpdatesPaginator.ts
index 0e7627e3ec70..d7236698d15d 100644
--- a/clients/client-elasticache/src/pagination/DescribeServiceUpdatesPaginator.ts
+++ b/clients/client-elasticache/src/pagination/DescribeServiceUpdatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeServiceUpdates(
       throw new Error("Invalid client, expected ElastiCache | ElastiCacheClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticache/src/pagination/DescribeSnapshotsPaginator.ts b/clients/client-elasticache/src/pagination/DescribeSnapshotsPaginator.ts
index 2dac305534fb..144d150f4f29 100644
--- a/clients/client-elasticache/src/pagination/DescribeSnapshotsPaginator.ts
+++ b/clients/client-elasticache/src/pagination/DescribeSnapshotsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeSnapshots(
       throw new Error("Invalid client, expected ElastiCache | ElastiCacheClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticache/src/pagination/DescribeUpdateActionsPaginator.ts b/clients/client-elasticache/src/pagination/DescribeUpdateActionsPaginator.ts
index 481d80443852..c82e4ba7f4bc 100644
--- a/clients/client-elasticache/src/pagination/DescribeUpdateActionsPaginator.ts
+++ b/clients/client-elasticache/src/pagination/DescribeUpdateActionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeUpdateActions(
       throw new Error("Invalid client, expected ElastiCache | ElastiCacheClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticache/src/pagination/DescribeUserGroupsPaginator.ts b/clients/client-elasticache/src/pagination/DescribeUserGroupsPaginator.ts
index 83872bafd235..a3291bd6f695 100644
--- a/clients/client-elasticache/src/pagination/DescribeUserGroupsPaginator.ts
+++ b/clients/client-elasticache/src/pagination/DescribeUserGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeUserGroups(
       throw new Error("Invalid client, expected ElastiCache | ElastiCacheClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticache/src/pagination/DescribeUsersPaginator.ts b/clients/client-elasticache/src/pagination/DescribeUsersPaginator.ts
index d6d217cd654d..bfb9f3aee39e 100644
--- a/clients/client-elasticache/src/pagination/DescribeUsersPaginator.ts
+++ b/clients/client-elasticache/src/pagination/DescribeUsersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeUsers(
       throw new Error("Invalid client, expected ElastiCache | ElastiCacheClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticsearch-service/src/pagination/DescribeDomainAutoTunesPaginator.ts b/clients/client-elasticsearch-service/src/pagination/DescribeDomainAutoTunesPaginator.ts
index f7d30abe818a..9c3b91272fbf 100644
--- a/clients/client-elasticsearch-service/src/pagination/DescribeDomainAutoTunesPaginator.ts
+++ b/clients/client-elasticsearch-service/src/pagination/DescribeDomainAutoTunesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDomainAutoTunes(
       throw new Error("Invalid client, expected ElasticsearchService | ElasticsearchServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticsearch-service/src/pagination/DescribeInboundCrossClusterSearchConnectionsPaginator.ts b/clients/client-elasticsearch-service/src/pagination/DescribeInboundCrossClusterSearchConnectionsPaginator.ts
index 95aababff947..7cc863c5402b 100644
--- a/clients/client-elasticsearch-service/src/pagination/DescribeInboundCrossClusterSearchConnectionsPaginator.ts
+++ b/clients/client-elasticsearch-service/src/pagination/DescribeInboundCrossClusterSearchConnectionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeInboundCrossClusterSearchConnections(
       throw new Error("Invalid client, expected ElasticsearchService | ElasticsearchServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticsearch-service/src/pagination/DescribeOutboundCrossClusterSearchConnectionsPaginator.ts b/clients/client-elasticsearch-service/src/pagination/DescribeOutboundCrossClusterSearchConnectionsPaginator.ts
index 7091bc0355ad..fe2bedcef22d 100644
--- a/clients/client-elasticsearch-service/src/pagination/DescribeOutboundCrossClusterSearchConnectionsPaginator.ts
+++ b/clients/client-elasticsearch-service/src/pagination/DescribeOutboundCrossClusterSearchConnectionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeOutboundCrossClusterSearchConnections(
       throw new Error("Invalid client, expected ElasticsearchService | ElasticsearchServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticsearch-service/src/pagination/DescribePackagesPaginator.ts b/clients/client-elasticsearch-service/src/pagination/DescribePackagesPaginator.ts
index d38209521854..df7c830ca7a3 100644
--- a/clients/client-elasticsearch-service/src/pagination/DescribePackagesPaginator.ts
+++ b/clients/client-elasticsearch-service/src/pagination/DescribePackagesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribePackages(
       throw new Error("Invalid client, expected ElasticsearchService | ElasticsearchServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticsearch-service/src/pagination/DescribeReservedElasticsearchInstanceOfferingsPaginator.ts b/clients/client-elasticsearch-service/src/pagination/DescribeReservedElasticsearchInstanceOfferingsPaginator.ts
index 754c2c67897e..6ead8839d383 100644
--- a/clients/client-elasticsearch-service/src/pagination/DescribeReservedElasticsearchInstanceOfferingsPaginator.ts
+++ b/clients/client-elasticsearch-service/src/pagination/DescribeReservedElasticsearchInstanceOfferingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeReservedElasticsearchInstanceOfferings(
       throw new Error("Invalid client, expected ElasticsearchService | ElasticsearchServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticsearch-service/src/pagination/DescribeReservedElasticsearchInstancesPaginator.ts b/clients/client-elasticsearch-service/src/pagination/DescribeReservedElasticsearchInstancesPaginator.ts
index 799a4158653f..47dbabf1ebeb 100644
--- a/clients/client-elasticsearch-service/src/pagination/DescribeReservedElasticsearchInstancesPaginator.ts
+++ b/clients/client-elasticsearch-service/src/pagination/DescribeReservedElasticsearchInstancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeReservedElasticsearchInstances(
       throw new Error("Invalid client, expected ElasticsearchService | ElasticsearchServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticsearch-service/src/pagination/GetPackageVersionHistoryPaginator.ts b/clients/client-elasticsearch-service/src/pagination/GetPackageVersionHistoryPaginator.ts
index 87b191fcb1a1..e609a62e3e9a 100644
--- a/clients/client-elasticsearch-service/src/pagination/GetPackageVersionHistoryPaginator.ts
+++ b/clients/client-elasticsearch-service/src/pagination/GetPackageVersionHistoryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetPackageVersionHistory(
       throw new Error("Invalid client, expected ElasticsearchService | ElasticsearchServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticsearch-service/src/pagination/GetUpgradeHistoryPaginator.ts b/clients/client-elasticsearch-service/src/pagination/GetUpgradeHistoryPaginator.ts
index d0780cfe7516..510dccf50b3c 100644
--- a/clients/client-elasticsearch-service/src/pagination/GetUpgradeHistoryPaginator.ts
+++ b/clients/client-elasticsearch-service/src/pagination/GetUpgradeHistoryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetUpgradeHistory(
       throw new Error("Invalid client, expected ElasticsearchService | ElasticsearchServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticsearch-service/src/pagination/ListDomainsForPackagePaginator.ts b/clients/client-elasticsearch-service/src/pagination/ListDomainsForPackagePaginator.ts
index 9a6b0ef42f90..a1a809b7fd82 100644
--- a/clients/client-elasticsearch-service/src/pagination/ListDomainsForPackagePaginator.ts
+++ b/clients/client-elasticsearch-service/src/pagination/ListDomainsForPackagePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDomainsForPackage(
       throw new Error("Invalid client, expected ElasticsearchService | ElasticsearchServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticsearch-service/src/pagination/ListElasticsearchInstanceTypesPaginator.ts b/clients/client-elasticsearch-service/src/pagination/ListElasticsearchInstanceTypesPaginator.ts
index 6e782ed19679..89f609a159bd 100644
--- a/clients/client-elasticsearch-service/src/pagination/ListElasticsearchInstanceTypesPaginator.ts
+++ b/clients/client-elasticsearch-service/src/pagination/ListElasticsearchInstanceTypesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListElasticsearchInstanceTypes(
       throw new Error("Invalid client, expected ElasticsearchService | ElasticsearchServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticsearch-service/src/pagination/ListElasticsearchVersionsPaginator.ts b/clients/client-elasticsearch-service/src/pagination/ListElasticsearchVersionsPaginator.ts
index 34b4a7817020..87f417c70c40 100644
--- a/clients/client-elasticsearch-service/src/pagination/ListElasticsearchVersionsPaginator.ts
+++ b/clients/client-elasticsearch-service/src/pagination/ListElasticsearchVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListElasticsearchVersions(
       throw new Error("Invalid client, expected ElasticsearchService | ElasticsearchServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-elasticsearch-service/src/pagination/ListPackagesForDomainPaginator.ts b/clients/client-elasticsearch-service/src/pagination/ListPackagesForDomainPaginator.ts
index 4a2f6dc1b6e3..a2f4c0e78d62 100644
--- a/clients/client-elasticsearch-service/src/pagination/ListPackagesForDomainPaginator.ts
+++ b/clients/client-elasticsearch-service/src/pagination/ListPackagesForDomainPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPackagesForDomain(
       throw new Error("Invalid client, expected ElasticsearchService | ElasticsearchServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-emr-containers/src/pagination/ListJobRunsPaginator.ts b/clients/client-emr-containers/src/pagination/ListJobRunsPaginator.ts
index f61e60a68aa5..e4380d7135f3 100644
--- a/clients/client-emr-containers/src/pagination/ListJobRunsPaginator.ts
+++ b/clients/client-emr-containers/src/pagination/ListJobRunsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListJobRuns(
       throw new Error("Invalid client, expected EMRContainers | EMRContainersClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-emr-containers/src/pagination/ListManagedEndpointsPaginator.ts b/clients/client-emr-containers/src/pagination/ListManagedEndpointsPaginator.ts
index 6f9f3b136f18..21fb3f11b15a 100644
--- a/clients/client-emr-containers/src/pagination/ListManagedEndpointsPaginator.ts
+++ b/clients/client-emr-containers/src/pagination/ListManagedEndpointsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListManagedEndpoints(
       throw new Error("Invalid client, expected EMRContainers | EMRContainersClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-emr-containers/src/pagination/ListVirtualClustersPaginator.ts b/clients/client-emr-containers/src/pagination/ListVirtualClustersPaginator.ts
index 9eaf15d569db..4cfc68c6d788 100644
--- a/clients/client-emr-containers/src/pagination/ListVirtualClustersPaginator.ts
+++ b/clients/client-emr-containers/src/pagination/ListVirtualClustersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListVirtualClusters(
       throw new Error("Invalid client, expected EMRContainers | EMRContainersClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-emr/src/pagination/ListBootstrapActionsPaginator.ts b/clients/client-emr/src/pagination/ListBootstrapActionsPaginator.ts
index 2b3113714d8b..d2a63cdb842f 100644
--- a/clients/client-emr/src/pagination/ListBootstrapActionsPaginator.ts
+++ b/clients/client-emr/src/pagination/ListBootstrapActionsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListBootstrapActions(
       throw new Error("Invalid client, expected EMR | EMRClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-emr/src/pagination/ListClustersPaginator.ts b/clients/client-emr/src/pagination/ListClustersPaginator.ts
index 73e3d7ee3dde..33a9c4b14c5f 100644
--- a/clients/client-emr/src/pagination/ListClustersPaginator.ts
+++ b/clients/client-emr/src/pagination/ListClustersPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListClusters(
       throw new Error("Invalid client, expected EMR | EMRClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-emr/src/pagination/ListInstanceFleetsPaginator.ts b/clients/client-emr/src/pagination/ListInstanceFleetsPaginator.ts
index c77afe7a9793..6ec5bdd5ae4c 100644
--- a/clients/client-emr/src/pagination/ListInstanceFleetsPaginator.ts
+++ b/clients/client-emr/src/pagination/ListInstanceFleetsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListInstanceFleets(
       throw new Error("Invalid client, expected EMR | EMRClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-emr/src/pagination/ListInstanceGroupsPaginator.ts b/clients/client-emr/src/pagination/ListInstanceGroupsPaginator.ts
index d20f0c2da7f8..b8726261824a 100644
--- a/clients/client-emr/src/pagination/ListInstanceGroupsPaginator.ts
+++ b/clients/client-emr/src/pagination/ListInstanceGroupsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListInstanceGroups(
       throw new Error("Invalid client, expected EMR | EMRClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-emr/src/pagination/ListInstancesPaginator.ts b/clients/client-emr/src/pagination/ListInstancesPaginator.ts
index bb27a0893ca8..e1ea82e7e425 100644
--- a/clients/client-emr/src/pagination/ListInstancesPaginator.ts
+++ b/clients/client-emr/src/pagination/ListInstancesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListInstances(
       throw new Error("Invalid client, expected EMR | EMRClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-emr/src/pagination/ListNotebookExecutionsPaginator.ts b/clients/client-emr/src/pagination/ListNotebookExecutionsPaginator.ts
index 30fc8b3f1ab7..c766760c5bab 100644
--- a/clients/client-emr/src/pagination/ListNotebookExecutionsPaginator.ts
+++ b/clients/client-emr/src/pagination/ListNotebookExecutionsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListNotebookExecutions(
       throw new Error("Invalid client, expected EMR | EMRClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-emr/src/pagination/ListReleaseLabelsPaginator.ts b/clients/client-emr/src/pagination/ListReleaseLabelsPaginator.ts
index 1227e44ef875..98a34c9aaa25 100644
--- a/clients/client-emr/src/pagination/ListReleaseLabelsPaginator.ts
+++ b/clients/client-emr/src/pagination/ListReleaseLabelsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListReleaseLabels(
       throw new Error("Invalid client, expected EMR | EMRClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-emr/src/pagination/ListSecurityConfigurationsPaginator.ts b/clients/client-emr/src/pagination/ListSecurityConfigurationsPaginator.ts
index 2e65b077d3e2..77c68b35c21a 100644
--- a/clients/client-emr/src/pagination/ListSecurityConfigurationsPaginator.ts
+++ b/clients/client-emr/src/pagination/ListSecurityConfigurationsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListSecurityConfigurations(
       throw new Error("Invalid client, expected EMR | EMRClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-emr/src/pagination/ListStepsPaginator.ts b/clients/client-emr/src/pagination/ListStepsPaginator.ts
index 1ac5c22e7e39..7bb48fb08da7 100644
--- a/clients/client-emr/src/pagination/ListStepsPaginator.ts
+++ b/clients/client-emr/src/pagination/ListStepsPaginator.ts
@@ -46,8 +46,9 @@ export async function* paginateListSteps(
       throw new Error("Invalid client, expected EMR | EMRClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-emr/src/pagination/ListStudioSessionMappingsPaginator.ts b/clients/client-emr/src/pagination/ListStudioSessionMappingsPaginator.ts
index 8e99e868fe4a..acaef27b6627 100644
--- a/clients/client-emr/src/pagination/ListStudioSessionMappingsPaginator.ts
+++ b/clients/client-emr/src/pagination/ListStudioSessionMappingsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListStudioSessionMappings(
       throw new Error("Invalid client, expected EMR | EMRClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-emr/src/pagination/ListStudiosPaginator.ts b/clients/client-emr/src/pagination/ListStudiosPaginator.ts
index 1fdf0ebaca02..8f24dfe6cae1 100644
--- a/clients/client-emr/src/pagination/ListStudiosPaginator.ts
+++ b/clients/client-emr/src/pagination/ListStudiosPaginator.ts
@@ -46,8 +46,9 @@ export async function* paginateListStudios(
       throw new Error("Invalid client, expected EMR | EMRClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-evidently/src/pagination/ListExperimentsPaginator.ts b/clients/client-evidently/src/pagination/ListExperimentsPaginator.ts
index fa7aab535e33..0e5626c30a12 100644
--- a/clients/client-evidently/src/pagination/ListExperimentsPaginator.ts
+++ b/clients/client-evidently/src/pagination/ListExperimentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListExperiments(
       throw new Error("Invalid client, expected Evidently | EvidentlyClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-evidently/src/pagination/ListFeaturesPaginator.ts b/clients/client-evidently/src/pagination/ListFeaturesPaginator.ts
index f9301587b769..f20370ab6f6e 100644
--- a/clients/client-evidently/src/pagination/ListFeaturesPaginator.ts
+++ b/clients/client-evidently/src/pagination/ListFeaturesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFeatures(
       throw new Error("Invalid client, expected Evidently | EvidentlyClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-evidently/src/pagination/ListLaunchesPaginator.ts b/clients/client-evidently/src/pagination/ListLaunchesPaginator.ts
index 34345933f97f..1be536d41b3f 100644
--- a/clients/client-evidently/src/pagination/ListLaunchesPaginator.ts
+++ b/clients/client-evidently/src/pagination/ListLaunchesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListLaunches(
       throw new Error("Invalid client, expected Evidently | EvidentlyClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-evidently/src/pagination/ListProjectsPaginator.ts b/clients/client-evidently/src/pagination/ListProjectsPaginator.ts
index 86ed5cdc3616..2c44899e9343 100644
--- a/clients/client-evidently/src/pagination/ListProjectsPaginator.ts
+++ b/clients/client-evidently/src/pagination/ListProjectsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListProjects(
       throw new Error("Invalid client, expected Evidently | EvidentlyClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-finspace-data/src/pagination/ListChangesetsPaginator.ts b/clients/client-finspace-data/src/pagination/ListChangesetsPaginator.ts
index f4f518353a36..206624be268a 100644
--- a/clients/client-finspace-data/src/pagination/ListChangesetsPaginator.ts
+++ b/clients/client-finspace-data/src/pagination/ListChangesetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListChangesets(
       throw new Error("Invalid client, expected FinspaceData | FinspaceDataClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-finspace-data/src/pagination/ListDataViewsPaginator.ts b/clients/client-finspace-data/src/pagination/ListDataViewsPaginator.ts
index ebff70e5bd65..dad38e4cb8b0 100644
--- a/clients/client-finspace-data/src/pagination/ListDataViewsPaginator.ts
+++ b/clients/client-finspace-data/src/pagination/ListDataViewsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDataViews(
       throw new Error("Invalid client, expected FinspaceData | FinspaceDataClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-finspace-data/src/pagination/ListDatasetsPaginator.ts b/clients/client-finspace-data/src/pagination/ListDatasetsPaginator.ts
index 92a5fc4a0991..e65118bf6692 100644
--- a/clients/client-finspace-data/src/pagination/ListDatasetsPaginator.ts
+++ b/clients/client-finspace-data/src/pagination/ListDatasetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDatasets(
       throw new Error("Invalid client, expected FinspaceData | FinspaceDataClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-finspace-data/src/pagination/ListPermissionGroupsPaginator.ts b/clients/client-finspace-data/src/pagination/ListPermissionGroupsPaginator.ts
index 4b245d4dcd0c..b3204fd1e725 100644
--- a/clients/client-finspace-data/src/pagination/ListPermissionGroupsPaginator.ts
+++ b/clients/client-finspace-data/src/pagination/ListPermissionGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPermissionGroups(
       throw new Error("Invalid client, expected FinspaceData | FinspaceDataClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-finspace-data/src/pagination/ListUsersPaginator.ts b/clients/client-finspace-data/src/pagination/ListUsersPaginator.ts
index 6411e50ba987..7c0435bbd12f 100644
--- a/clients/client-finspace-data/src/pagination/ListUsersPaginator.ts
+++ b/clients/client-finspace-data/src/pagination/ListUsersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListUsers(
       throw new Error("Invalid client, expected FinspaceData | FinspaceDataClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-fis/src/pagination/ListActionsPaginator.ts b/clients/client-fis/src/pagination/ListActionsPaginator.ts
index 8312d5620cf8..f5c2bed9164c 100644
--- a/clients/client-fis/src/pagination/ListActionsPaginator.ts
+++ b/clients/client-fis/src/pagination/ListActionsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListActions(
       throw new Error("Invalid client, expected Fis | FisClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-fis/src/pagination/ListExperimentTemplatesPaginator.ts b/clients/client-fis/src/pagination/ListExperimentTemplatesPaginator.ts
index cc230b01ce14..dc001138ff05 100644
--- a/clients/client-fis/src/pagination/ListExperimentTemplatesPaginator.ts
+++ b/clients/client-fis/src/pagination/ListExperimentTemplatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListExperimentTemplates(
       throw new Error("Invalid client, expected Fis | FisClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-fis/src/pagination/ListExperimentsPaginator.ts b/clients/client-fis/src/pagination/ListExperimentsPaginator.ts
index 0fb47b56f688..c9e7dbe306ad 100644
--- a/clients/client-fis/src/pagination/ListExperimentsPaginator.ts
+++ b/clients/client-fis/src/pagination/ListExperimentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListExperiments(
       throw new Error("Invalid client, expected Fis | FisClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-fis/src/pagination/ListTargetResourceTypesPaginator.ts b/clients/client-fis/src/pagination/ListTargetResourceTypesPaginator.ts
index 67dda8e1d1db..4d8009710187 100644
--- a/clients/client-fis/src/pagination/ListTargetResourceTypesPaginator.ts
+++ b/clients/client-fis/src/pagination/ListTargetResourceTypesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTargetResourceTypes(
       throw new Error("Invalid client, expected Fis | FisClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-fms/src/pagination/ListAppsListsPaginator.ts b/clients/client-fms/src/pagination/ListAppsListsPaginator.ts
index bd1b54c786e3..f13fb707fa47 100644
--- a/clients/client-fms/src/pagination/ListAppsListsPaginator.ts
+++ b/clients/client-fms/src/pagination/ListAppsListsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAppsLists(
       throw new Error("Invalid client, expected FMS | FMSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-fms/src/pagination/ListComplianceStatusPaginator.ts b/clients/client-fms/src/pagination/ListComplianceStatusPaginator.ts
index 0921a89f7bd7..53ae521457f1 100644
--- a/clients/client-fms/src/pagination/ListComplianceStatusPaginator.ts
+++ b/clients/client-fms/src/pagination/ListComplianceStatusPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListComplianceStatus(
       throw new Error("Invalid client, expected FMS | FMSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-fms/src/pagination/ListMemberAccountsPaginator.ts b/clients/client-fms/src/pagination/ListMemberAccountsPaginator.ts
index 09dbdb50096a..62c650a7729e 100644
--- a/clients/client-fms/src/pagination/ListMemberAccountsPaginator.ts
+++ b/clients/client-fms/src/pagination/ListMemberAccountsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListMemberAccounts(
       throw new Error("Invalid client, expected FMS | FMSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-fms/src/pagination/ListPoliciesPaginator.ts b/clients/client-fms/src/pagination/ListPoliciesPaginator.ts
index f5209b7e4ce0..b2b7864be158 100644
--- a/clients/client-fms/src/pagination/ListPoliciesPaginator.ts
+++ b/clients/client-fms/src/pagination/ListPoliciesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPolicies(
       throw new Error("Invalid client, expected FMS | FMSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-fms/src/pagination/ListProtocolsListsPaginator.ts b/clients/client-fms/src/pagination/ListProtocolsListsPaginator.ts
index f63e53383854..2bdd71049906 100644
--- a/clients/client-fms/src/pagination/ListProtocolsListsPaginator.ts
+++ b/clients/client-fms/src/pagination/ListProtocolsListsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListProtocolsLists(
       throw new Error("Invalid client, expected FMS | FMSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-fms/src/pagination/ListThirdPartyFirewallFirewallPoliciesPaginator.ts b/clients/client-fms/src/pagination/ListThirdPartyFirewallFirewallPoliciesPaginator.ts
index c7d623ce2030..7dd0fe8b805f 100644
--- a/clients/client-fms/src/pagination/ListThirdPartyFirewallFirewallPoliciesPaginator.ts
+++ b/clients/client-fms/src/pagination/ListThirdPartyFirewallFirewallPoliciesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListThirdPartyFirewallFirewallPolicies(
       throw new Error("Invalid client, expected FMS | FMSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-forecast/src/pagination/ListDatasetGroupsPaginator.ts b/clients/client-forecast/src/pagination/ListDatasetGroupsPaginator.ts
index b93a2075e5a5..4857a8b19c2f 100644
--- a/clients/client-forecast/src/pagination/ListDatasetGroupsPaginator.ts
+++ b/clients/client-forecast/src/pagination/ListDatasetGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDatasetGroups(
       throw new Error("Invalid client, expected Forecast | ForecastClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-forecast/src/pagination/ListDatasetImportJobsPaginator.ts b/clients/client-forecast/src/pagination/ListDatasetImportJobsPaginator.ts
index 7945c9ad30ca..5139cf4a655f 100644
--- a/clients/client-forecast/src/pagination/ListDatasetImportJobsPaginator.ts
+++ b/clients/client-forecast/src/pagination/ListDatasetImportJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDatasetImportJobs(
       throw new Error("Invalid client, expected Forecast | ForecastClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-forecast/src/pagination/ListDatasetsPaginator.ts b/clients/client-forecast/src/pagination/ListDatasetsPaginator.ts
index 80de9a4dfb76..5bad0bbbe23f 100644
--- a/clients/client-forecast/src/pagination/ListDatasetsPaginator.ts
+++ b/clients/client-forecast/src/pagination/ListDatasetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDatasets(
       throw new Error("Invalid client, expected Forecast | ForecastClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-forecast/src/pagination/ListForecastExportJobsPaginator.ts b/clients/client-forecast/src/pagination/ListForecastExportJobsPaginator.ts
index 2465fe4f26b9..3d0e059bcb63 100644
--- a/clients/client-forecast/src/pagination/ListForecastExportJobsPaginator.ts
+++ b/clients/client-forecast/src/pagination/ListForecastExportJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListForecastExportJobs(
       throw new Error("Invalid client, expected Forecast | ForecastClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-forecast/src/pagination/ListForecastsPaginator.ts b/clients/client-forecast/src/pagination/ListForecastsPaginator.ts
index 48044c50c10a..210dc77f83b4 100644
--- a/clients/client-forecast/src/pagination/ListForecastsPaginator.ts
+++ b/clients/client-forecast/src/pagination/ListForecastsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListForecasts(
       throw new Error("Invalid client, expected Forecast | ForecastClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-forecast/src/pagination/ListPredictorBacktestExportJobsPaginator.ts b/clients/client-forecast/src/pagination/ListPredictorBacktestExportJobsPaginator.ts
index e2317f5a04f1..7e7e3d1eb118 100644
--- a/clients/client-forecast/src/pagination/ListPredictorBacktestExportJobsPaginator.ts
+++ b/clients/client-forecast/src/pagination/ListPredictorBacktestExportJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPredictorBacktestExportJobs(
       throw new Error("Invalid client, expected Forecast | ForecastClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-forecast/src/pagination/ListPredictorsPaginator.ts b/clients/client-forecast/src/pagination/ListPredictorsPaginator.ts
index 38e8e4ae9d3d..23606a80262e 100644
--- a/clients/client-forecast/src/pagination/ListPredictorsPaginator.ts
+++ b/clients/client-forecast/src/pagination/ListPredictorsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPredictors(
       throw new Error("Invalid client, expected Forecast | ForecastClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-frauddetector/src/pagination/DescribeModelVersionsPaginator.ts b/clients/client-frauddetector/src/pagination/DescribeModelVersionsPaginator.ts
index 8ecc42f4678f..a3162273d0a4 100644
--- a/clients/client-frauddetector/src/pagination/DescribeModelVersionsPaginator.ts
+++ b/clients/client-frauddetector/src/pagination/DescribeModelVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeModelVersions(
       throw new Error("Invalid client, expected FraudDetector | FraudDetectorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-frauddetector/src/pagination/GetBatchImportJobsPaginator.ts b/clients/client-frauddetector/src/pagination/GetBatchImportJobsPaginator.ts
index 127dc72ef6e8..2ee2b65fc564 100644
--- a/clients/client-frauddetector/src/pagination/GetBatchImportJobsPaginator.ts
+++ b/clients/client-frauddetector/src/pagination/GetBatchImportJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetBatchImportJobs(
       throw new Error("Invalid client, expected FraudDetector | FraudDetectorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-frauddetector/src/pagination/GetBatchPredictionJobsPaginator.ts b/clients/client-frauddetector/src/pagination/GetBatchPredictionJobsPaginator.ts
index 4553a91eda0d..57ce7016058d 100644
--- a/clients/client-frauddetector/src/pagination/GetBatchPredictionJobsPaginator.ts
+++ b/clients/client-frauddetector/src/pagination/GetBatchPredictionJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetBatchPredictionJobs(
       throw new Error("Invalid client, expected FraudDetector | FraudDetectorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-frauddetector/src/pagination/GetDetectorsPaginator.ts b/clients/client-frauddetector/src/pagination/GetDetectorsPaginator.ts
index c005bec3db95..41e22d49e844 100644
--- a/clients/client-frauddetector/src/pagination/GetDetectorsPaginator.ts
+++ b/clients/client-frauddetector/src/pagination/GetDetectorsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetDetectors(
       throw new Error("Invalid client, expected FraudDetector | FraudDetectorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-frauddetector/src/pagination/GetEntityTypesPaginator.ts b/clients/client-frauddetector/src/pagination/GetEntityTypesPaginator.ts
index ce691098124c..c5f7f4586b76 100644
--- a/clients/client-frauddetector/src/pagination/GetEntityTypesPaginator.ts
+++ b/clients/client-frauddetector/src/pagination/GetEntityTypesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetEntityTypes(
       throw new Error("Invalid client, expected FraudDetector | FraudDetectorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-frauddetector/src/pagination/GetEventTypesPaginator.ts b/clients/client-frauddetector/src/pagination/GetEventTypesPaginator.ts
index 6f6d446a3e1d..15d0eff4d6f2 100644
--- a/clients/client-frauddetector/src/pagination/GetEventTypesPaginator.ts
+++ b/clients/client-frauddetector/src/pagination/GetEventTypesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetEventTypes(
       throw new Error("Invalid client, expected FraudDetector | FraudDetectorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-frauddetector/src/pagination/GetExternalModelsPaginator.ts b/clients/client-frauddetector/src/pagination/GetExternalModelsPaginator.ts
index 19bf8d1a3d64..8bc9665f806f 100644
--- a/clients/client-frauddetector/src/pagination/GetExternalModelsPaginator.ts
+++ b/clients/client-frauddetector/src/pagination/GetExternalModelsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetExternalModels(
       throw new Error("Invalid client, expected FraudDetector | FraudDetectorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-frauddetector/src/pagination/GetLabelsPaginator.ts b/clients/client-frauddetector/src/pagination/GetLabelsPaginator.ts
index accfbd5cd339..2913321f80f1 100644
--- a/clients/client-frauddetector/src/pagination/GetLabelsPaginator.ts
+++ b/clients/client-frauddetector/src/pagination/GetLabelsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateGetLabels(
       throw new Error("Invalid client, expected FraudDetector | FraudDetectorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-frauddetector/src/pagination/GetModelsPaginator.ts b/clients/client-frauddetector/src/pagination/GetModelsPaginator.ts
index 79669ade58ee..4facd8fbbc90 100644
--- a/clients/client-frauddetector/src/pagination/GetModelsPaginator.ts
+++ b/clients/client-frauddetector/src/pagination/GetModelsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateGetModels(
       throw new Error("Invalid client, expected FraudDetector | FraudDetectorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-frauddetector/src/pagination/GetOutcomesPaginator.ts b/clients/client-frauddetector/src/pagination/GetOutcomesPaginator.ts
index 61b89738e4e0..b8294be908c3 100644
--- a/clients/client-frauddetector/src/pagination/GetOutcomesPaginator.ts
+++ b/clients/client-frauddetector/src/pagination/GetOutcomesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateGetOutcomes(
       throw new Error("Invalid client, expected FraudDetector | FraudDetectorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-frauddetector/src/pagination/GetRulesPaginator.ts b/clients/client-frauddetector/src/pagination/GetRulesPaginator.ts
index 0014f5590fb8..546f0e18b5e9 100644
--- a/clients/client-frauddetector/src/pagination/GetRulesPaginator.ts
+++ b/clients/client-frauddetector/src/pagination/GetRulesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateGetRules(
       throw new Error("Invalid client, expected FraudDetector | FraudDetectorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-frauddetector/src/pagination/GetVariablesPaginator.ts b/clients/client-frauddetector/src/pagination/GetVariablesPaginator.ts
index a9184e745d1b..a544ae616b3c 100644
--- a/clients/client-frauddetector/src/pagination/GetVariablesPaginator.ts
+++ b/clients/client-frauddetector/src/pagination/GetVariablesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetVariables(
       throw new Error("Invalid client, expected FraudDetector | FraudDetectorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-frauddetector/src/pagination/ListEventPredictionsPaginator.ts b/clients/client-frauddetector/src/pagination/ListEventPredictionsPaginator.ts
index 2380d8262286..7fc28ebef30d 100644
--- a/clients/client-frauddetector/src/pagination/ListEventPredictionsPaginator.ts
+++ b/clients/client-frauddetector/src/pagination/ListEventPredictionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEventPredictions(
       throw new Error("Invalid client, expected FraudDetector | FraudDetectorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-frauddetector/src/pagination/ListTagsForResourcePaginator.ts b/clients/client-frauddetector/src/pagination/ListTagsForResourcePaginator.ts
index 912889c20e90..b7e185c78bb7 100644
--- a/clients/client-frauddetector/src/pagination/ListTagsForResourcePaginator.ts
+++ b/clients/client-frauddetector/src/pagination/ListTagsForResourcePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTagsForResource(
       throw new Error("Invalid client, expected FraudDetector | FraudDetectorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-fsx/src/pagination/DescribeBackupsPaginator.ts b/clients/client-fsx/src/pagination/DescribeBackupsPaginator.ts
index ddd29eca0f62..dc6eb02f9d2a 100644
--- a/clients/client-fsx/src/pagination/DescribeBackupsPaginator.ts
+++ b/clients/client-fsx/src/pagination/DescribeBackupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeBackups(
       throw new Error("Invalid client, expected FSx | FSxClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-fsx/src/pagination/DescribeDataRepositoryAssociationsPaginator.ts b/clients/client-fsx/src/pagination/DescribeDataRepositoryAssociationsPaginator.ts
index 1b270b6eff2b..4965e98882f9 100644
--- a/clients/client-fsx/src/pagination/DescribeDataRepositoryAssociationsPaginator.ts
+++ b/clients/client-fsx/src/pagination/DescribeDataRepositoryAssociationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDataRepositoryAssociations(
       throw new Error("Invalid client, expected FSx | FSxClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-fsx/src/pagination/DescribeDataRepositoryTasksPaginator.ts b/clients/client-fsx/src/pagination/DescribeDataRepositoryTasksPaginator.ts
index 6fb51d37d816..90d4c2bcdbae 100644
--- a/clients/client-fsx/src/pagination/DescribeDataRepositoryTasksPaginator.ts
+++ b/clients/client-fsx/src/pagination/DescribeDataRepositoryTasksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDataRepositoryTasks(
       throw new Error("Invalid client, expected FSx | FSxClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-fsx/src/pagination/DescribeFileSystemAliasesPaginator.ts b/clients/client-fsx/src/pagination/DescribeFileSystemAliasesPaginator.ts
index 33991685ace3..2c00d7eb9872 100644
--- a/clients/client-fsx/src/pagination/DescribeFileSystemAliasesPaginator.ts
+++ b/clients/client-fsx/src/pagination/DescribeFileSystemAliasesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeFileSystemAliases(
       throw new Error("Invalid client, expected FSx | FSxClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-fsx/src/pagination/DescribeFileSystemsPaginator.ts b/clients/client-fsx/src/pagination/DescribeFileSystemsPaginator.ts
index aa96523d2d12..46ca1c0539b9 100644
--- a/clients/client-fsx/src/pagination/DescribeFileSystemsPaginator.ts
+++ b/clients/client-fsx/src/pagination/DescribeFileSystemsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeFileSystems(
       throw new Error("Invalid client, expected FSx | FSxClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-fsx/src/pagination/DescribeSnapshotsPaginator.ts b/clients/client-fsx/src/pagination/DescribeSnapshotsPaginator.ts
index a17f1579b5cc..cda4768d7378 100644
--- a/clients/client-fsx/src/pagination/DescribeSnapshotsPaginator.ts
+++ b/clients/client-fsx/src/pagination/DescribeSnapshotsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeSnapshots(
       throw new Error("Invalid client, expected FSx | FSxClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-fsx/src/pagination/DescribeStorageVirtualMachinesPaginator.ts b/clients/client-fsx/src/pagination/DescribeStorageVirtualMachinesPaginator.ts
index 3a19defc84b7..d0b8b2e6f568 100644
--- a/clients/client-fsx/src/pagination/DescribeStorageVirtualMachinesPaginator.ts
+++ b/clients/client-fsx/src/pagination/DescribeStorageVirtualMachinesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeStorageVirtualMachines(
       throw new Error("Invalid client, expected FSx | FSxClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-fsx/src/pagination/DescribeVolumesPaginator.ts b/clients/client-fsx/src/pagination/DescribeVolumesPaginator.ts
index ec00eb6250ac..22d0ccb2b452 100644
--- a/clients/client-fsx/src/pagination/DescribeVolumesPaginator.ts
+++ b/clients/client-fsx/src/pagination/DescribeVolumesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeVolumes(
       throw new Error("Invalid client, expected FSx | FSxClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-fsx/src/pagination/ListTagsForResourcePaginator.ts b/clients/client-fsx/src/pagination/ListTagsForResourcePaginator.ts
index de6ba0610bb0..b9fb59e407fd 100644
--- a/clients/client-fsx/src/pagination/ListTagsForResourcePaginator.ts
+++ b/clients/client-fsx/src/pagination/ListTagsForResourcePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTagsForResource(
       throw new Error("Invalid client, expected FSx | FSxClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-gamelift/src/pagination/DescribeFleetAttributesPaginator.ts b/clients/client-gamelift/src/pagination/DescribeFleetAttributesPaginator.ts
index 83c40b6c7b12..792604c33cd1 100644
--- a/clients/client-gamelift/src/pagination/DescribeFleetAttributesPaginator.ts
+++ b/clients/client-gamelift/src/pagination/DescribeFleetAttributesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeFleetAttributes(
       throw new Error("Invalid client, expected GameLift | GameLiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-gamelift/src/pagination/DescribeFleetCapacityPaginator.ts b/clients/client-gamelift/src/pagination/DescribeFleetCapacityPaginator.ts
index 872e661f14ae..10e5424f6482 100644
--- a/clients/client-gamelift/src/pagination/DescribeFleetCapacityPaginator.ts
+++ b/clients/client-gamelift/src/pagination/DescribeFleetCapacityPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeFleetCapacity(
       throw new Error("Invalid client, expected GameLift | GameLiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-gamelift/src/pagination/DescribeFleetEventsPaginator.ts b/clients/client-gamelift/src/pagination/DescribeFleetEventsPaginator.ts
index 3fad4b0cbd92..32ba553d0811 100644
--- a/clients/client-gamelift/src/pagination/DescribeFleetEventsPaginator.ts
+++ b/clients/client-gamelift/src/pagination/DescribeFleetEventsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeFleetEvents(
       throw new Error("Invalid client, expected GameLift | GameLiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-gamelift/src/pagination/DescribeFleetLocationAttributesPaginator.ts b/clients/client-gamelift/src/pagination/DescribeFleetLocationAttributesPaginator.ts
index 3628df68564f..42ffc953cca0 100644
--- a/clients/client-gamelift/src/pagination/DescribeFleetLocationAttributesPaginator.ts
+++ b/clients/client-gamelift/src/pagination/DescribeFleetLocationAttributesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeFleetLocationAttributes(
       throw new Error("Invalid client, expected GameLift | GameLiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-gamelift/src/pagination/DescribeFleetUtilizationPaginator.ts b/clients/client-gamelift/src/pagination/DescribeFleetUtilizationPaginator.ts
index 046c02ec0ac4..6b851af81bdc 100644
--- a/clients/client-gamelift/src/pagination/DescribeFleetUtilizationPaginator.ts
+++ b/clients/client-gamelift/src/pagination/DescribeFleetUtilizationPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeFleetUtilization(
       throw new Error("Invalid client, expected GameLift | GameLiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-gamelift/src/pagination/DescribeGameServerInstancesPaginator.ts b/clients/client-gamelift/src/pagination/DescribeGameServerInstancesPaginator.ts
index 5d378654d24d..d512bcc27731 100644
--- a/clients/client-gamelift/src/pagination/DescribeGameServerInstancesPaginator.ts
+++ b/clients/client-gamelift/src/pagination/DescribeGameServerInstancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeGameServerInstances(
       throw new Error("Invalid client, expected GameLift | GameLiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-gamelift/src/pagination/DescribeGameSessionDetailsPaginator.ts b/clients/client-gamelift/src/pagination/DescribeGameSessionDetailsPaginator.ts
index a5293158eaff..fe16ed606121 100644
--- a/clients/client-gamelift/src/pagination/DescribeGameSessionDetailsPaginator.ts
+++ b/clients/client-gamelift/src/pagination/DescribeGameSessionDetailsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeGameSessionDetails(
       throw new Error("Invalid client, expected GameLift | GameLiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-gamelift/src/pagination/DescribeGameSessionQueuesPaginator.ts b/clients/client-gamelift/src/pagination/DescribeGameSessionQueuesPaginator.ts
index c5433c923aaf..bace81ec09e5 100644
--- a/clients/client-gamelift/src/pagination/DescribeGameSessionQueuesPaginator.ts
+++ b/clients/client-gamelift/src/pagination/DescribeGameSessionQueuesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeGameSessionQueues(
       throw new Error("Invalid client, expected GameLift | GameLiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-gamelift/src/pagination/DescribeGameSessionsPaginator.ts b/clients/client-gamelift/src/pagination/DescribeGameSessionsPaginator.ts
index 29c4bf3e6578..c4a39809886e 100644
--- a/clients/client-gamelift/src/pagination/DescribeGameSessionsPaginator.ts
+++ b/clients/client-gamelift/src/pagination/DescribeGameSessionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeGameSessions(
       throw new Error("Invalid client, expected GameLift | GameLiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-gamelift/src/pagination/DescribeInstancesPaginator.ts b/clients/client-gamelift/src/pagination/DescribeInstancesPaginator.ts
index 0ccc58446419..d3afa3dc3e7d 100644
--- a/clients/client-gamelift/src/pagination/DescribeInstancesPaginator.ts
+++ b/clients/client-gamelift/src/pagination/DescribeInstancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeInstances(
       throw new Error("Invalid client, expected GameLift | GameLiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-gamelift/src/pagination/DescribeMatchmakingConfigurationsPaginator.ts b/clients/client-gamelift/src/pagination/DescribeMatchmakingConfigurationsPaginator.ts
index 9a3b5f0c17f1..65d5120d336b 100644
--- a/clients/client-gamelift/src/pagination/DescribeMatchmakingConfigurationsPaginator.ts
+++ b/clients/client-gamelift/src/pagination/DescribeMatchmakingConfigurationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeMatchmakingConfigurations(
       throw new Error("Invalid client, expected GameLift | GameLiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-gamelift/src/pagination/DescribeMatchmakingRuleSetsPaginator.ts b/clients/client-gamelift/src/pagination/DescribeMatchmakingRuleSetsPaginator.ts
index 37f148ca7a07..e8f8127300d9 100644
--- a/clients/client-gamelift/src/pagination/DescribeMatchmakingRuleSetsPaginator.ts
+++ b/clients/client-gamelift/src/pagination/DescribeMatchmakingRuleSetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeMatchmakingRuleSets(
       throw new Error("Invalid client, expected GameLift | GameLiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-gamelift/src/pagination/DescribePlayerSessionsPaginator.ts b/clients/client-gamelift/src/pagination/DescribePlayerSessionsPaginator.ts
index 07171d33336a..6e5e9d3dbf6b 100644
--- a/clients/client-gamelift/src/pagination/DescribePlayerSessionsPaginator.ts
+++ b/clients/client-gamelift/src/pagination/DescribePlayerSessionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribePlayerSessions(
       throw new Error("Invalid client, expected GameLift | GameLiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-gamelift/src/pagination/DescribeScalingPoliciesPaginator.ts b/clients/client-gamelift/src/pagination/DescribeScalingPoliciesPaginator.ts
index 2fa4bb16a643..a642f95fdbaf 100644
--- a/clients/client-gamelift/src/pagination/DescribeScalingPoliciesPaginator.ts
+++ b/clients/client-gamelift/src/pagination/DescribeScalingPoliciesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeScalingPolicies(
       throw new Error("Invalid client, expected GameLift | GameLiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-gamelift/src/pagination/ListAliasesPaginator.ts b/clients/client-gamelift/src/pagination/ListAliasesPaginator.ts
index 222c5a77459a..af14f33e3db6 100644
--- a/clients/client-gamelift/src/pagination/ListAliasesPaginator.ts
+++ b/clients/client-gamelift/src/pagination/ListAliasesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListAliases(
       throw new Error("Invalid client, expected GameLift | GameLiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-gamelift/src/pagination/ListBuildsPaginator.ts b/clients/client-gamelift/src/pagination/ListBuildsPaginator.ts
index ee461215d296..d83e651e8bf0 100644
--- a/clients/client-gamelift/src/pagination/ListBuildsPaginator.ts
+++ b/clients/client-gamelift/src/pagination/ListBuildsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListBuilds(
       throw new Error("Invalid client, expected GameLift | GameLiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-gamelift/src/pagination/ListFleetsPaginator.ts b/clients/client-gamelift/src/pagination/ListFleetsPaginator.ts
index 167f7c5089cd..f6e096ac2cb9 100644
--- a/clients/client-gamelift/src/pagination/ListFleetsPaginator.ts
+++ b/clients/client-gamelift/src/pagination/ListFleetsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListFleets(
       throw new Error("Invalid client, expected GameLift | GameLiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-gamelift/src/pagination/ListGameServerGroupsPaginator.ts b/clients/client-gamelift/src/pagination/ListGameServerGroupsPaginator.ts
index 15852ffda2b1..fd6bbedc46b1 100644
--- a/clients/client-gamelift/src/pagination/ListGameServerGroupsPaginator.ts
+++ b/clients/client-gamelift/src/pagination/ListGameServerGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListGameServerGroups(
       throw new Error("Invalid client, expected GameLift | GameLiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-gamelift/src/pagination/ListGameServersPaginator.ts b/clients/client-gamelift/src/pagination/ListGameServersPaginator.ts
index 68b793208923..f379bd3e1452 100644
--- a/clients/client-gamelift/src/pagination/ListGameServersPaginator.ts
+++ b/clients/client-gamelift/src/pagination/ListGameServersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListGameServers(
       throw new Error("Invalid client, expected GameLift | GameLiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-gamelift/src/pagination/ListScriptsPaginator.ts b/clients/client-gamelift/src/pagination/ListScriptsPaginator.ts
index 2977e0ef4596..484880298de6 100644
--- a/clients/client-gamelift/src/pagination/ListScriptsPaginator.ts
+++ b/clients/client-gamelift/src/pagination/ListScriptsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListScripts(
       throw new Error("Invalid client, expected GameLift | GameLiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-gamelift/src/pagination/SearchGameSessionsPaginator.ts b/clients/client-gamelift/src/pagination/SearchGameSessionsPaginator.ts
index 26e9a1f17994..9db058c47dac 100644
--- a/clients/client-gamelift/src/pagination/SearchGameSessionsPaginator.ts
+++ b/clients/client-gamelift/src/pagination/SearchGameSessionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchGameSessions(
       throw new Error("Invalid client, expected GameLift | GameLiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-gamesparks/src/pagination/ListExtensionVersionsPaginator.ts b/clients/client-gamesparks/src/pagination/ListExtensionVersionsPaginator.ts
index 02303703816d..4047a9e91229 100644
--- a/clients/client-gamesparks/src/pagination/ListExtensionVersionsPaginator.ts
+++ b/clients/client-gamesparks/src/pagination/ListExtensionVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListExtensionVersions(
       throw new Error("Invalid client, expected GameSparks | GameSparksClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-gamesparks/src/pagination/ListExtensionsPaginator.ts b/clients/client-gamesparks/src/pagination/ListExtensionsPaginator.ts
index 32e10e469bb7..4b7d1aaa4b4d 100644
--- a/clients/client-gamesparks/src/pagination/ListExtensionsPaginator.ts
+++ b/clients/client-gamesparks/src/pagination/ListExtensionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListExtensions(
       throw new Error("Invalid client, expected GameSparks | GameSparksClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-gamesparks/src/pagination/ListGamesPaginator.ts b/clients/client-gamesparks/src/pagination/ListGamesPaginator.ts
index 28e5271c063d..7f68827bd240 100644
--- a/clients/client-gamesparks/src/pagination/ListGamesPaginator.ts
+++ b/clients/client-gamesparks/src/pagination/ListGamesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListGames(
       throw new Error("Invalid client, expected GameSparks | GameSparksClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-gamesparks/src/pagination/ListGeneratedCodeJobsPaginator.ts b/clients/client-gamesparks/src/pagination/ListGeneratedCodeJobsPaginator.ts
index 65beb0aa1d5f..745ceb5e652a 100644
--- a/clients/client-gamesparks/src/pagination/ListGeneratedCodeJobsPaginator.ts
+++ b/clients/client-gamesparks/src/pagination/ListGeneratedCodeJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListGeneratedCodeJobs(
       throw new Error("Invalid client, expected GameSparks | GameSparksClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-gamesparks/src/pagination/ListSnapshotsPaginator.ts b/clients/client-gamesparks/src/pagination/ListSnapshotsPaginator.ts
index db7b0192646e..0c36097b6b19 100644
--- a/clients/client-gamesparks/src/pagination/ListSnapshotsPaginator.ts
+++ b/clients/client-gamesparks/src/pagination/ListSnapshotsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSnapshots(
       throw new Error("Invalid client, expected GameSparks | GameSparksClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-gamesparks/src/pagination/ListStageDeploymentsPaginator.ts b/clients/client-gamesparks/src/pagination/ListStageDeploymentsPaginator.ts
index 51072109398d..2b3f8e478cb8 100644
--- a/clients/client-gamesparks/src/pagination/ListStageDeploymentsPaginator.ts
+++ b/clients/client-gamesparks/src/pagination/ListStageDeploymentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListStageDeployments(
       throw new Error("Invalid client, expected GameSparks | GameSparksClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-gamesparks/src/pagination/ListStagesPaginator.ts b/clients/client-gamesparks/src/pagination/ListStagesPaginator.ts
index 7970bc72a089..1d439f9ad82a 100644
--- a/clients/client-gamesparks/src/pagination/ListStagesPaginator.ts
+++ b/clients/client-gamesparks/src/pagination/ListStagesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListStages(
       throw new Error("Invalid client, expected GameSparks | GameSparksClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glacier/src/pagination/ListJobsPaginator.ts b/clients/client-glacier/src/pagination/ListJobsPaginator.ts
index 334a1e67f769..c600715bcf37 100644
--- a/clients/client-glacier/src/pagination/ListJobsPaginator.ts
+++ b/clients/client-glacier/src/pagination/ListJobsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListJobs(
       throw new Error("Invalid client, expected Glacier | GlacierClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glacier/src/pagination/ListMultipartUploadsPaginator.ts b/clients/client-glacier/src/pagination/ListMultipartUploadsPaginator.ts
index 29d7fd299d8e..dd5dba0270b9 100644
--- a/clients/client-glacier/src/pagination/ListMultipartUploadsPaginator.ts
+++ b/clients/client-glacier/src/pagination/ListMultipartUploadsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListMultipartUploads(
       throw new Error("Invalid client, expected Glacier | GlacierClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glacier/src/pagination/ListPartsPaginator.ts b/clients/client-glacier/src/pagination/ListPartsPaginator.ts
index aa5bc87b4132..c3fc5a5b50e0 100644
--- a/clients/client-glacier/src/pagination/ListPartsPaginator.ts
+++ b/clients/client-glacier/src/pagination/ListPartsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListParts(
       throw new Error("Invalid client, expected Glacier | GlacierClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glacier/src/pagination/ListVaultsPaginator.ts b/clients/client-glacier/src/pagination/ListVaultsPaginator.ts
index ad84807c13d9..47cc773831e5 100644
--- a/clients/client-glacier/src/pagination/ListVaultsPaginator.ts
+++ b/clients/client-glacier/src/pagination/ListVaultsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListVaults(
       throw new Error("Invalid client, expected Glacier | GlacierClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-global-accelerator/src/pagination/ListAcceleratorsPaginator.ts b/clients/client-global-accelerator/src/pagination/ListAcceleratorsPaginator.ts
index 7d714a0ef42d..47c8b097e9aa 100644
--- a/clients/client-global-accelerator/src/pagination/ListAcceleratorsPaginator.ts
+++ b/clients/client-global-accelerator/src/pagination/ListAcceleratorsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAccelerators(
       throw new Error("Invalid client, expected GlobalAccelerator | GlobalAcceleratorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-global-accelerator/src/pagination/ListByoipCidrsPaginator.ts b/clients/client-global-accelerator/src/pagination/ListByoipCidrsPaginator.ts
index 1529332bef67..e08725a5c2a1 100644
--- a/clients/client-global-accelerator/src/pagination/ListByoipCidrsPaginator.ts
+++ b/clients/client-global-accelerator/src/pagination/ListByoipCidrsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListByoipCidrs(
       throw new Error("Invalid client, expected GlobalAccelerator | GlobalAcceleratorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-global-accelerator/src/pagination/ListCustomRoutingAcceleratorsPaginator.ts b/clients/client-global-accelerator/src/pagination/ListCustomRoutingAcceleratorsPaginator.ts
index cd6aed2e947d..e7d17320e65b 100644
--- a/clients/client-global-accelerator/src/pagination/ListCustomRoutingAcceleratorsPaginator.ts
+++ b/clients/client-global-accelerator/src/pagination/ListCustomRoutingAcceleratorsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCustomRoutingAccelerators(
       throw new Error("Invalid client, expected GlobalAccelerator | GlobalAcceleratorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-global-accelerator/src/pagination/ListCustomRoutingEndpointGroupsPaginator.ts b/clients/client-global-accelerator/src/pagination/ListCustomRoutingEndpointGroupsPaginator.ts
index 691183159e2c..8ac7cd50623c 100644
--- a/clients/client-global-accelerator/src/pagination/ListCustomRoutingEndpointGroupsPaginator.ts
+++ b/clients/client-global-accelerator/src/pagination/ListCustomRoutingEndpointGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCustomRoutingEndpointGroups(
       throw new Error("Invalid client, expected GlobalAccelerator | GlobalAcceleratorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-global-accelerator/src/pagination/ListCustomRoutingListenersPaginator.ts b/clients/client-global-accelerator/src/pagination/ListCustomRoutingListenersPaginator.ts
index 7efebc83e508..936e66c24f00 100644
--- a/clients/client-global-accelerator/src/pagination/ListCustomRoutingListenersPaginator.ts
+++ b/clients/client-global-accelerator/src/pagination/ListCustomRoutingListenersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCustomRoutingListeners(
       throw new Error("Invalid client, expected GlobalAccelerator | GlobalAcceleratorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-global-accelerator/src/pagination/ListCustomRoutingPortMappingsByDestinationPaginator.ts b/clients/client-global-accelerator/src/pagination/ListCustomRoutingPortMappingsByDestinationPaginator.ts
index d76af8334c29..e89fec90e387 100644
--- a/clients/client-global-accelerator/src/pagination/ListCustomRoutingPortMappingsByDestinationPaginator.ts
+++ b/clients/client-global-accelerator/src/pagination/ListCustomRoutingPortMappingsByDestinationPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCustomRoutingPortMappingsByDestination(
       throw new Error("Invalid client, expected GlobalAccelerator | GlobalAcceleratorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-global-accelerator/src/pagination/ListCustomRoutingPortMappingsPaginator.ts b/clients/client-global-accelerator/src/pagination/ListCustomRoutingPortMappingsPaginator.ts
index 5a48bb721356..2cf16fec35a1 100644
--- a/clients/client-global-accelerator/src/pagination/ListCustomRoutingPortMappingsPaginator.ts
+++ b/clients/client-global-accelerator/src/pagination/ListCustomRoutingPortMappingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCustomRoutingPortMappings(
       throw new Error("Invalid client, expected GlobalAccelerator | GlobalAcceleratorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-global-accelerator/src/pagination/ListEndpointGroupsPaginator.ts b/clients/client-global-accelerator/src/pagination/ListEndpointGroupsPaginator.ts
index 295c99a09bb2..17c9994db883 100644
--- a/clients/client-global-accelerator/src/pagination/ListEndpointGroupsPaginator.ts
+++ b/clients/client-global-accelerator/src/pagination/ListEndpointGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEndpointGroups(
       throw new Error("Invalid client, expected GlobalAccelerator | GlobalAcceleratorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-global-accelerator/src/pagination/ListListenersPaginator.ts b/clients/client-global-accelerator/src/pagination/ListListenersPaginator.ts
index 883caf7d885a..810c13f72c9f 100644
--- a/clients/client-global-accelerator/src/pagination/ListListenersPaginator.ts
+++ b/clients/client-global-accelerator/src/pagination/ListListenersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListListeners(
       throw new Error("Invalid client, expected GlobalAccelerator | GlobalAcceleratorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/GetBlueprintRunsPaginator.ts b/clients/client-glue/src/pagination/GetBlueprintRunsPaginator.ts
index d4d00b77201b..5c66413d8490 100644
--- a/clients/client-glue/src/pagination/GetBlueprintRunsPaginator.ts
+++ b/clients/client-glue/src/pagination/GetBlueprintRunsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetBlueprintRuns(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/GetClassifiersPaginator.ts b/clients/client-glue/src/pagination/GetClassifiersPaginator.ts
index af6c7fda7852..bf172df4bd63 100644
--- a/clients/client-glue/src/pagination/GetClassifiersPaginator.ts
+++ b/clients/client-glue/src/pagination/GetClassifiersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetClassifiers(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/GetConnectionsPaginator.ts b/clients/client-glue/src/pagination/GetConnectionsPaginator.ts
index 573842271aab..f46f3926ca38 100644
--- a/clients/client-glue/src/pagination/GetConnectionsPaginator.ts
+++ b/clients/client-glue/src/pagination/GetConnectionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetConnections(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/GetCrawlerMetricsPaginator.ts b/clients/client-glue/src/pagination/GetCrawlerMetricsPaginator.ts
index 68ab6176f6e9..14e699b94452 100644
--- a/clients/client-glue/src/pagination/GetCrawlerMetricsPaginator.ts
+++ b/clients/client-glue/src/pagination/GetCrawlerMetricsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetCrawlerMetrics(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/GetCrawlersPaginator.ts b/clients/client-glue/src/pagination/GetCrawlersPaginator.ts
index a695fee073c1..f83d9bec8e1d 100644
--- a/clients/client-glue/src/pagination/GetCrawlersPaginator.ts
+++ b/clients/client-glue/src/pagination/GetCrawlersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateGetCrawlers(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/GetDatabasesPaginator.ts b/clients/client-glue/src/pagination/GetDatabasesPaginator.ts
index 6e6a49e36d5c..2edb92d911fb 100644
--- a/clients/client-glue/src/pagination/GetDatabasesPaginator.ts
+++ b/clients/client-glue/src/pagination/GetDatabasesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetDatabases(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/GetDevEndpointsPaginator.ts b/clients/client-glue/src/pagination/GetDevEndpointsPaginator.ts
index 8034f10be177..9cb140340c9b 100644
--- a/clients/client-glue/src/pagination/GetDevEndpointsPaginator.ts
+++ b/clients/client-glue/src/pagination/GetDevEndpointsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetDevEndpoints(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/GetJobRunsPaginator.ts b/clients/client-glue/src/pagination/GetJobRunsPaginator.ts
index a1b7533b5d60..18abbb4d9987 100644
--- a/clients/client-glue/src/pagination/GetJobRunsPaginator.ts
+++ b/clients/client-glue/src/pagination/GetJobRunsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateGetJobRuns(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/GetJobsPaginator.ts b/clients/client-glue/src/pagination/GetJobsPaginator.ts
index 94b8bda3c618..07b8c1c4de0e 100644
--- a/clients/client-glue/src/pagination/GetJobsPaginator.ts
+++ b/clients/client-glue/src/pagination/GetJobsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateGetJobs(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/GetMLTaskRunsPaginator.ts b/clients/client-glue/src/pagination/GetMLTaskRunsPaginator.ts
index 88fb58c47a83..f936d30495c4 100644
--- a/clients/client-glue/src/pagination/GetMLTaskRunsPaginator.ts
+++ b/clients/client-glue/src/pagination/GetMLTaskRunsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetMLTaskRuns(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/GetMLTransformsPaginator.ts b/clients/client-glue/src/pagination/GetMLTransformsPaginator.ts
index 90b619ff76ab..d5f6f8668bc3 100644
--- a/clients/client-glue/src/pagination/GetMLTransformsPaginator.ts
+++ b/clients/client-glue/src/pagination/GetMLTransformsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetMLTransforms(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/GetPartitionIndexesPaginator.ts b/clients/client-glue/src/pagination/GetPartitionIndexesPaginator.ts
index 750de8a624d6..f23cdd816a2d 100644
--- a/clients/client-glue/src/pagination/GetPartitionIndexesPaginator.ts
+++ b/clients/client-glue/src/pagination/GetPartitionIndexesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateGetPartitionIndexes(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/GetPartitionsPaginator.ts b/clients/client-glue/src/pagination/GetPartitionsPaginator.ts
index 00da087012a9..87ae7f4d4a46 100644
--- a/clients/client-glue/src/pagination/GetPartitionsPaginator.ts
+++ b/clients/client-glue/src/pagination/GetPartitionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetPartitions(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/GetResourcePoliciesPaginator.ts b/clients/client-glue/src/pagination/GetResourcePoliciesPaginator.ts
index ab5c00c80145..504d7dec87d3 100644
--- a/clients/client-glue/src/pagination/GetResourcePoliciesPaginator.ts
+++ b/clients/client-glue/src/pagination/GetResourcePoliciesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetResourcePolicies(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/GetSecurityConfigurationsPaginator.ts b/clients/client-glue/src/pagination/GetSecurityConfigurationsPaginator.ts
index 1b9db465b9f4..35f6eaa0bf69 100644
--- a/clients/client-glue/src/pagination/GetSecurityConfigurationsPaginator.ts
+++ b/clients/client-glue/src/pagination/GetSecurityConfigurationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetSecurityConfigurations(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/GetTableVersionsPaginator.ts b/clients/client-glue/src/pagination/GetTableVersionsPaginator.ts
index e5e137326b97..23f9fc85c950 100644
--- a/clients/client-glue/src/pagination/GetTableVersionsPaginator.ts
+++ b/clients/client-glue/src/pagination/GetTableVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetTableVersions(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/GetTablesPaginator.ts b/clients/client-glue/src/pagination/GetTablesPaginator.ts
index 52bb65936559..3a4e827b32bf 100644
--- a/clients/client-glue/src/pagination/GetTablesPaginator.ts
+++ b/clients/client-glue/src/pagination/GetTablesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateGetTables(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/GetTriggersPaginator.ts b/clients/client-glue/src/pagination/GetTriggersPaginator.ts
index ced74afc1cca..a006b2d216b7 100644
--- a/clients/client-glue/src/pagination/GetTriggersPaginator.ts
+++ b/clients/client-glue/src/pagination/GetTriggersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateGetTriggers(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/GetUnfilteredPartitionsMetadataPaginator.ts b/clients/client-glue/src/pagination/GetUnfilteredPartitionsMetadataPaginator.ts
index bfafeca6138e..a1d202aaad6f 100644
--- a/clients/client-glue/src/pagination/GetUnfilteredPartitionsMetadataPaginator.ts
+++ b/clients/client-glue/src/pagination/GetUnfilteredPartitionsMetadataPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetUnfilteredPartitionsMetadata(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/GetUserDefinedFunctionsPaginator.ts b/clients/client-glue/src/pagination/GetUserDefinedFunctionsPaginator.ts
index 241aca5628d2..b412ca6d7a31 100644
--- a/clients/client-glue/src/pagination/GetUserDefinedFunctionsPaginator.ts
+++ b/clients/client-glue/src/pagination/GetUserDefinedFunctionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetUserDefinedFunctions(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/GetWorkflowRunsPaginator.ts b/clients/client-glue/src/pagination/GetWorkflowRunsPaginator.ts
index c24d39c6922b..1095618f8d85 100644
--- a/clients/client-glue/src/pagination/GetWorkflowRunsPaginator.ts
+++ b/clients/client-glue/src/pagination/GetWorkflowRunsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetWorkflowRuns(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/ListBlueprintsPaginator.ts b/clients/client-glue/src/pagination/ListBlueprintsPaginator.ts
index 3630d696c775..de78105397f7 100644
--- a/clients/client-glue/src/pagination/ListBlueprintsPaginator.ts
+++ b/clients/client-glue/src/pagination/ListBlueprintsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListBlueprints(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/ListCrawlersPaginator.ts b/clients/client-glue/src/pagination/ListCrawlersPaginator.ts
index 2e398358edea..cd21a2513505 100644
--- a/clients/client-glue/src/pagination/ListCrawlersPaginator.ts
+++ b/clients/client-glue/src/pagination/ListCrawlersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCrawlers(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/ListDevEndpointsPaginator.ts b/clients/client-glue/src/pagination/ListDevEndpointsPaginator.ts
index 4703d0d8dc95..fc5b53813993 100644
--- a/clients/client-glue/src/pagination/ListDevEndpointsPaginator.ts
+++ b/clients/client-glue/src/pagination/ListDevEndpointsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDevEndpoints(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/ListJobsPaginator.ts b/clients/client-glue/src/pagination/ListJobsPaginator.ts
index 48e2b373a325..2094119a0ef0 100644
--- a/clients/client-glue/src/pagination/ListJobsPaginator.ts
+++ b/clients/client-glue/src/pagination/ListJobsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListJobs(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/ListMLTransformsPaginator.ts b/clients/client-glue/src/pagination/ListMLTransformsPaginator.ts
index 9851545fd531..ddd78e234765 100644
--- a/clients/client-glue/src/pagination/ListMLTransformsPaginator.ts
+++ b/clients/client-glue/src/pagination/ListMLTransformsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListMLTransforms(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/ListRegistriesPaginator.ts b/clients/client-glue/src/pagination/ListRegistriesPaginator.ts
index 64c42da9db37..2a721d7949ce 100644
--- a/clients/client-glue/src/pagination/ListRegistriesPaginator.ts
+++ b/clients/client-glue/src/pagination/ListRegistriesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRegistries(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/ListSchemaVersionsPaginator.ts b/clients/client-glue/src/pagination/ListSchemaVersionsPaginator.ts
index 8a816d721013..53ba2b9ee0fd 100644
--- a/clients/client-glue/src/pagination/ListSchemaVersionsPaginator.ts
+++ b/clients/client-glue/src/pagination/ListSchemaVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSchemaVersions(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/ListSchemasPaginator.ts b/clients/client-glue/src/pagination/ListSchemasPaginator.ts
index 002aa1380e96..58c13eaec914 100644
--- a/clients/client-glue/src/pagination/ListSchemasPaginator.ts
+++ b/clients/client-glue/src/pagination/ListSchemasPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListSchemas(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/ListSessionsPaginator.ts b/clients/client-glue/src/pagination/ListSessionsPaginator.ts
index 96d90e5fba71..dbb8fbb81cab 100644
--- a/clients/client-glue/src/pagination/ListSessionsPaginator.ts
+++ b/clients/client-glue/src/pagination/ListSessionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSessions(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/ListTriggersPaginator.ts b/clients/client-glue/src/pagination/ListTriggersPaginator.ts
index e949967f57bb..2969fb868e27 100644
--- a/clients/client-glue/src/pagination/ListTriggersPaginator.ts
+++ b/clients/client-glue/src/pagination/ListTriggersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTriggers(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/ListWorkflowsPaginator.ts b/clients/client-glue/src/pagination/ListWorkflowsPaginator.ts
index 04590d649bc7..e482a3849f9c 100644
--- a/clients/client-glue/src/pagination/ListWorkflowsPaginator.ts
+++ b/clients/client-glue/src/pagination/ListWorkflowsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListWorkflows(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/SearchTablesPaginator.ts b/clients/client-glue/src/pagination/SearchTablesPaginator.ts
index b370d3fe0b8b..86584ad2bf98 100644
--- a/clients/client-glue/src/pagination/SearchTablesPaginator.ts
+++ b/clients/client-glue/src/pagination/SearchTablesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchTables(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-grafana/src/pagination/ListPermissionsPaginator.ts b/clients/client-grafana/src/pagination/ListPermissionsPaginator.ts
index 2f85730ce2f7..56cb0dba4710 100644
--- a/clients/client-grafana/src/pagination/ListPermissionsPaginator.ts
+++ b/clients/client-grafana/src/pagination/ListPermissionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPermissions(
       throw new Error("Invalid client, expected Grafana | GrafanaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-grafana/src/pagination/ListWorkspacesPaginator.ts b/clients/client-grafana/src/pagination/ListWorkspacesPaginator.ts
index 0c745ab8a22f..fd28aca22902 100644
--- a/clients/client-grafana/src/pagination/ListWorkspacesPaginator.ts
+++ b/clients/client-grafana/src/pagination/ListWorkspacesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListWorkspaces(
       throw new Error("Invalid client, expected Grafana | GrafanaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-greengrassv2/src/pagination/ListClientDevicesAssociatedWithCoreDevicePaginator.ts b/clients/client-greengrassv2/src/pagination/ListClientDevicesAssociatedWithCoreDevicePaginator.ts
index 23630520b76b..4705e544891c 100644
--- a/clients/client-greengrassv2/src/pagination/ListClientDevicesAssociatedWithCoreDevicePaginator.ts
+++ b/clients/client-greengrassv2/src/pagination/ListClientDevicesAssociatedWithCoreDevicePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListClientDevicesAssociatedWithCoreDevice(
       throw new Error("Invalid client, expected GreengrassV2 | GreengrassV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-greengrassv2/src/pagination/ListComponentVersionsPaginator.ts b/clients/client-greengrassv2/src/pagination/ListComponentVersionsPaginator.ts
index 710ebe466f0e..92a413b2f34d 100644
--- a/clients/client-greengrassv2/src/pagination/ListComponentVersionsPaginator.ts
+++ b/clients/client-greengrassv2/src/pagination/ListComponentVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListComponentVersions(
       throw new Error("Invalid client, expected GreengrassV2 | GreengrassV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-greengrassv2/src/pagination/ListComponentsPaginator.ts b/clients/client-greengrassv2/src/pagination/ListComponentsPaginator.ts
index b3ba88aaaa05..a4c80445e09e 100644
--- a/clients/client-greengrassv2/src/pagination/ListComponentsPaginator.ts
+++ b/clients/client-greengrassv2/src/pagination/ListComponentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListComponents(
       throw new Error("Invalid client, expected GreengrassV2 | GreengrassV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-greengrassv2/src/pagination/ListCoreDevicesPaginator.ts b/clients/client-greengrassv2/src/pagination/ListCoreDevicesPaginator.ts
index 6d879e22b353..ddb63a9fb9c9 100644
--- a/clients/client-greengrassv2/src/pagination/ListCoreDevicesPaginator.ts
+++ b/clients/client-greengrassv2/src/pagination/ListCoreDevicesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCoreDevices(
       throw new Error("Invalid client, expected GreengrassV2 | GreengrassV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-greengrassv2/src/pagination/ListDeploymentsPaginator.ts b/clients/client-greengrassv2/src/pagination/ListDeploymentsPaginator.ts
index b0a6270dfc06..297fa94c141e 100644
--- a/clients/client-greengrassv2/src/pagination/ListDeploymentsPaginator.ts
+++ b/clients/client-greengrassv2/src/pagination/ListDeploymentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDeployments(
       throw new Error("Invalid client, expected GreengrassV2 | GreengrassV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-greengrassv2/src/pagination/ListEffectiveDeploymentsPaginator.ts b/clients/client-greengrassv2/src/pagination/ListEffectiveDeploymentsPaginator.ts
index d32f8f9f13d9..c8b9d2cd9503 100644
--- a/clients/client-greengrassv2/src/pagination/ListEffectiveDeploymentsPaginator.ts
+++ b/clients/client-greengrassv2/src/pagination/ListEffectiveDeploymentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEffectiveDeployments(
       throw new Error("Invalid client, expected GreengrassV2 | GreengrassV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-greengrassv2/src/pagination/ListInstalledComponentsPaginator.ts b/clients/client-greengrassv2/src/pagination/ListInstalledComponentsPaginator.ts
index 894e8dcbe869..06316731a41e 100644
--- a/clients/client-greengrassv2/src/pagination/ListInstalledComponentsPaginator.ts
+++ b/clients/client-greengrassv2/src/pagination/ListInstalledComponentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListInstalledComponents(
       throw new Error("Invalid client, expected GreengrassV2 | GreengrassV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-groundstation/src/pagination/ListConfigsPaginator.ts b/clients/client-groundstation/src/pagination/ListConfigsPaginator.ts
index 2ef66a8ad4c8..6e806d4bc3bb 100644
--- a/clients/client-groundstation/src/pagination/ListConfigsPaginator.ts
+++ b/clients/client-groundstation/src/pagination/ListConfigsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListConfigs(
       throw new Error("Invalid client, expected GroundStation | GroundStationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-groundstation/src/pagination/ListContactsPaginator.ts b/clients/client-groundstation/src/pagination/ListContactsPaginator.ts
index 60c80cb6fb21..3f443e4d7f39 100644
--- a/clients/client-groundstation/src/pagination/ListContactsPaginator.ts
+++ b/clients/client-groundstation/src/pagination/ListContactsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListContacts(
       throw new Error("Invalid client, expected GroundStation | GroundStationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-groundstation/src/pagination/ListDataflowEndpointGroupsPaginator.ts b/clients/client-groundstation/src/pagination/ListDataflowEndpointGroupsPaginator.ts
index 44fefa723243..ed2971b58f83 100644
--- a/clients/client-groundstation/src/pagination/ListDataflowEndpointGroupsPaginator.ts
+++ b/clients/client-groundstation/src/pagination/ListDataflowEndpointGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDataflowEndpointGroups(
       throw new Error("Invalid client, expected GroundStation | GroundStationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-groundstation/src/pagination/ListGroundStationsPaginator.ts b/clients/client-groundstation/src/pagination/ListGroundStationsPaginator.ts
index e4432733df5d..6dc99bb5dd43 100644
--- a/clients/client-groundstation/src/pagination/ListGroundStationsPaginator.ts
+++ b/clients/client-groundstation/src/pagination/ListGroundStationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListGroundStations(
       throw new Error("Invalid client, expected GroundStation | GroundStationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-groundstation/src/pagination/ListMissionProfilesPaginator.ts b/clients/client-groundstation/src/pagination/ListMissionProfilesPaginator.ts
index f45bacaf287c..7e926ff6610f 100644
--- a/clients/client-groundstation/src/pagination/ListMissionProfilesPaginator.ts
+++ b/clients/client-groundstation/src/pagination/ListMissionProfilesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListMissionProfiles(
       throw new Error("Invalid client, expected GroundStation | GroundStationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-groundstation/src/pagination/ListSatellitesPaginator.ts b/clients/client-groundstation/src/pagination/ListSatellitesPaginator.ts
index 9b05693d3d7d..003c156ef423 100644
--- a/clients/client-groundstation/src/pagination/ListSatellitesPaginator.ts
+++ b/clients/client-groundstation/src/pagination/ListSatellitesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSatellites(
       throw new Error("Invalid client, expected GroundStation | GroundStationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-guardduty/src/pagination/GetUsageStatisticsPaginator.ts b/clients/client-guardduty/src/pagination/GetUsageStatisticsPaginator.ts
index a2b6b1726afe..ada765d7188d 100644
--- a/clients/client-guardduty/src/pagination/GetUsageStatisticsPaginator.ts
+++ b/clients/client-guardduty/src/pagination/GetUsageStatisticsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetUsageStatistics(
       throw new Error("Invalid client, expected GuardDuty | GuardDutyClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-guardduty/src/pagination/ListDetectorsPaginator.ts b/clients/client-guardduty/src/pagination/ListDetectorsPaginator.ts
index 2f22584809e2..ede95e6b681b 100644
--- a/clients/client-guardduty/src/pagination/ListDetectorsPaginator.ts
+++ b/clients/client-guardduty/src/pagination/ListDetectorsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDetectors(
       throw new Error("Invalid client, expected GuardDuty | GuardDutyClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-guardduty/src/pagination/ListFiltersPaginator.ts b/clients/client-guardduty/src/pagination/ListFiltersPaginator.ts
index 0a09f69eb1b7..505463850789 100644
--- a/clients/client-guardduty/src/pagination/ListFiltersPaginator.ts
+++ b/clients/client-guardduty/src/pagination/ListFiltersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListFilters(
       throw new Error("Invalid client, expected GuardDuty | GuardDutyClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-guardduty/src/pagination/ListFindingsPaginator.ts b/clients/client-guardduty/src/pagination/ListFindingsPaginator.ts
index 7a67ff4bcfd7..48f909025f80 100644
--- a/clients/client-guardduty/src/pagination/ListFindingsPaginator.ts
+++ b/clients/client-guardduty/src/pagination/ListFindingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFindings(
       throw new Error("Invalid client, expected GuardDuty | GuardDutyClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-guardduty/src/pagination/ListIPSetsPaginator.ts b/clients/client-guardduty/src/pagination/ListIPSetsPaginator.ts
index ddb8f460486b..19e41036bb23 100644
--- a/clients/client-guardduty/src/pagination/ListIPSetsPaginator.ts
+++ b/clients/client-guardduty/src/pagination/ListIPSetsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListIPSets(
       throw new Error("Invalid client, expected GuardDuty | GuardDutyClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-guardduty/src/pagination/ListInvitationsPaginator.ts b/clients/client-guardduty/src/pagination/ListInvitationsPaginator.ts
index 7d6de10fe210..106e63066d47 100644
--- a/clients/client-guardduty/src/pagination/ListInvitationsPaginator.ts
+++ b/clients/client-guardduty/src/pagination/ListInvitationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListInvitations(
       throw new Error("Invalid client, expected GuardDuty | GuardDutyClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-guardduty/src/pagination/ListMembersPaginator.ts b/clients/client-guardduty/src/pagination/ListMembersPaginator.ts
index 029ac37660df..62fcd2b6112d 100644
--- a/clients/client-guardduty/src/pagination/ListMembersPaginator.ts
+++ b/clients/client-guardduty/src/pagination/ListMembersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListMembers(
       throw new Error("Invalid client, expected GuardDuty | GuardDutyClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-guardduty/src/pagination/ListOrganizationAdminAccountsPaginator.ts b/clients/client-guardduty/src/pagination/ListOrganizationAdminAccountsPaginator.ts
index ef2aa797989c..ef45ea02b644 100644
--- a/clients/client-guardduty/src/pagination/ListOrganizationAdminAccountsPaginator.ts
+++ b/clients/client-guardduty/src/pagination/ListOrganizationAdminAccountsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListOrganizationAdminAccounts(
       throw new Error("Invalid client, expected GuardDuty | GuardDutyClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-guardduty/src/pagination/ListPublishingDestinationsPaginator.ts b/clients/client-guardduty/src/pagination/ListPublishingDestinationsPaginator.ts
index e7d2b92d78a5..e9ef048c14ef 100644
--- a/clients/client-guardduty/src/pagination/ListPublishingDestinationsPaginator.ts
+++ b/clients/client-guardduty/src/pagination/ListPublishingDestinationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPublishingDestinations(
       throw new Error("Invalid client, expected GuardDuty | GuardDutyClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-guardduty/src/pagination/ListThreatIntelSetsPaginator.ts b/clients/client-guardduty/src/pagination/ListThreatIntelSetsPaginator.ts
index e94a2cc6ff50..6b85ac94d22f 100644
--- a/clients/client-guardduty/src/pagination/ListThreatIntelSetsPaginator.ts
+++ b/clients/client-guardduty/src/pagination/ListThreatIntelSetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListThreatIntelSets(
       throw new Error("Invalid client, expected GuardDuty | GuardDutyClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-health/src/pagination/DescribeAffectedAccountsForOrganizationPaginator.ts b/clients/client-health/src/pagination/DescribeAffectedAccountsForOrganizationPaginator.ts
index 44387efb1e02..c969d6f19ebd 100644
--- a/clients/client-health/src/pagination/DescribeAffectedAccountsForOrganizationPaginator.ts
+++ b/clients/client-health/src/pagination/DescribeAffectedAccountsForOrganizationPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeAffectedAccountsForOrganization(
       throw new Error("Invalid client, expected Health | HealthClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-health/src/pagination/DescribeAffectedEntitiesForOrganizationPaginator.ts b/clients/client-health/src/pagination/DescribeAffectedEntitiesForOrganizationPaginator.ts
index 9c38294a7eb0..fe6b8b5fddb2 100644
--- a/clients/client-health/src/pagination/DescribeAffectedEntitiesForOrganizationPaginator.ts
+++ b/clients/client-health/src/pagination/DescribeAffectedEntitiesForOrganizationPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeAffectedEntitiesForOrganization(
       throw new Error("Invalid client, expected Health | HealthClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-health/src/pagination/DescribeAffectedEntitiesPaginator.ts b/clients/client-health/src/pagination/DescribeAffectedEntitiesPaginator.ts
index c0d2c090199b..5ce6e7b9fc29 100644
--- a/clients/client-health/src/pagination/DescribeAffectedEntitiesPaginator.ts
+++ b/clients/client-health/src/pagination/DescribeAffectedEntitiesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeAffectedEntities(
       throw new Error("Invalid client, expected Health | HealthClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-health/src/pagination/DescribeEventAggregatesPaginator.ts b/clients/client-health/src/pagination/DescribeEventAggregatesPaginator.ts
index 636ec4c734da..4c5a91d69108 100644
--- a/clients/client-health/src/pagination/DescribeEventAggregatesPaginator.ts
+++ b/clients/client-health/src/pagination/DescribeEventAggregatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEventAggregates(
       throw new Error("Invalid client, expected Health | HealthClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-health/src/pagination/DescribeEventTypesPaginator.ts b/clients/client-health/src/pagination/DescribeEventTypesPaginator.ts
index e77bbfa73359..7a51129204f5 100644
--- a/clients/client-health/src/pagination/DescribeEventTypesPaginator.ts
+++ b/clients/client-health/src/pagination/DescribeEventTypesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEventTypes(
       throw new Error("Invalid client, expected Health | HealthClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-health/src/pagination/DescribeEventsForOrganizationPaginator.ts b/clients/client-health/src/pagination/DescribeEventsForOrganizationPaginator.ts
index 23428087a51c..391c4719de97 100644
--- a/clients/client-health/src/pagination/DescribeEventsForOrganizationPaginator.ts
+++ b/clients/client-health/src/pagination/DescribeEventsForOrganizationPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEventsForOrganization(
       throw new Error("Invalid client, expected Health | HealthClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-health/src/pagination/DescribeEventsPaginator.ts b/clients/client-health/src/pagination/DescribeEventsPaginator.ts
index 6cc0adc6d051..eac67ede2048 100644
--- a/clients/client-health/src/pagination/DescribeEventsPaginator.ts
+++ b/clients/client-health/src/pagination/DescribeEventsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEvents(
       throw new Error("Invalid client, expected Health | HealthClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-healthlake/src/pagination/ListFHIRDatastoresPaginator.ts b/clients/client-healthlake/src/pagination/ListFHIRDatastoresPaginator.ts
index bb4caf2abdc1..d0ab957ea9f0 100644
--- a/clients/client-healthlake/src/pagination/ListFHIRDatastoresPaginator.ts
+++ b/clients/client-healthlake/src/pagination/ListFHIRDatastoresPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFHIRDatastores(
       throw new Error("Invalid client, expected HealthLake | HealthLakeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-healthlake/src/pagination/ListFHIRExportJobsPaginator.ts b/clients/client-healthlake/src/pagination/ListFHIRExportJobsPaginator.ts
index c72979b62a1d..806b09a9174b 100644
--- a/clients/client-healthlake/src/pagination/ListFHIRExportJobsPaginator.ts
+++ b/clients/client-healthlake/src/pagination/ListFHIRExportJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFHIRExportJobs(
       throw new Error("Invalid client, expected HealthLake | HealthLakeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-healthlake/src/pagination/ListFHIRImportJobsPaginator.ts b/clients/client-healthlake/src/pagination/ListFHIRImportJobsPaginator.ts
index 458291f7151b..93cbd0ca86c9 100644
--- a/clients/client-healthlake/src/pagination/ListFHIRImportJobsPaginator.ts
+++ b/clients/client-healthlake/src/pagination/ListFHIRImportJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFHIRImportJobs(
       throw new Error("Invalid client, expected HealthLake | HealthLakeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-honeycode/src/pagination/ListTableColumnsPaginator.ts b/clients/client-honeycode/src/pagination/ListTableColumnsPaginator.ts
index d9b109cfe550..4896030e41b7 100644
--- a/clients/client-honeycode/src/pagination/ListTableColumnsPaginator.ts
+++ b/clients/client-honeycode/src/pagination/ListTableColumnsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListTableColumns(
       throw new Error("Invalid client, expected Honeycode | HoneycodeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-honeycode/src/pagination/ListTableRowsPaginator.ts b/clients/client-honeycode/src/pagination/ListTableRowsPaginator.ts
index ce3f8d6679c7..d9effc821faa 100644
--- a/clients/client-honeycode/src/pagination/ListTableRowsPaginator.ts
+++ b/clients/client-honeycode/src/pagination/ListTableRowsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTableRows(
       throw new Error("Invalid client, expected Honeycode | HoneycodeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-honeycode/src/pagination/ListTablesPaginator.ts b/clients/client-honeycode/src/pagination/ListTablesPaginator.ts
index 257407eaf30a..1138c034025f 100644
--- a/clients/client-honeycode/src/pagination/ListTablesPaginator.ts
+++ b/clients/client-honeycode/src/pagination/ListTablesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListTables(
       throw new Error("Invalid client, expected Honeycode | HoneycodeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-honeycode/src/pagination/QueryTableRowsPaginator.ts b/clients/client-honeycode/src/pagination/QueryTableRowsPaginator.ts
index 915088f352f5..8f4e411142d5 100644
--- a/clients/client-honeycode/src/pagination/QueryTableRowsPaginator.ts
+++ b/clients/client-honeycode/src/pagination/QueryTableRowsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateQueryTableRows(
       throw new Error("Invalid client, expected Honeycode | HoneycodeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iam/src/pagination/GetAccountAuthorizationDetailsPaginator.ts b/clients/client-iam/src/pagination/GetAccountAuthorizationDetailsPaginator.ts
index c0688ff0b432..6fbc1e981b7f 100644
--- a/clients/client-iam/src/pagination/GetAccountAuthorizationDetailsPaginator.ts
+++ b/clients/client-iam/src/pagination/GetAccountAuthorizationDetailsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetAccountAuthorizationDetails(
       throw new Error("Invalid client, expected IAM | IAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iam/src/pagination/GetGroupPaginator.ts b/clients/client-iam/src/pagination/GetGroupPaginator.ts
index e1604a9a1dcf..382187328b4d 100644
--- a/clients/client-iam/src/pagination/GetGroupPaginator.ts
+++ b/clients/client-iam/src/pagination/GetGroupPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateGetGroup(
       throw new Error("Invalid client, expected IAM | IAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iam/src/pagination/ListAccessKeysPaginator.ts b/clients/client-iam/src/pagination/ListAccessKeysPaginator.ts
index a05a35a24fae..0dd612ded3e2 100644
--- a/clients/client-iam/src/pagination/ListAccessKeysPaginator.ts
+++ b/clients/client-iam/src/pagination/ListAccessKeysPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAccessKeys(
       throw new Error("Invalid client, expected IAM | IAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iam/src/pagination/ListAccountAliasesPaginator.ts b/clients/client-iam/src/pagination/ListAccountAliasesPaginator.ts
index b1672d2ebf58..07344bf576f1 100644
--- a/clients/client-iam/src/pagination/ListAccountAliasesPaginator.ts
+++ b/clients/client-iam/src/pagination/ListAccountAliasesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAccountAliases(
       throw new Error("Invalid client, expected IAM | IAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iam/src/pagination/ListAttachedGroupPoliciesPaginator.ts b/clients/client-iam/src/pagination/ListAttachedGroupPoliciesPaginator.ts
index 4358d18dc892..788daab5c90c 100644
--- a/clients/client-iam/src/pagination/ListAttachedGroupPoliciesPaginator.ts
+++ b/clients/client-iam/src/pagination/ListAttachedGroupPoliciesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAttachedGroupPolicies(
       throw new Error("Invalid client, expected IAM | IAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iam/src/pagination/ListAttachedRolePoliciesPaginator.ts b/clients/client-iam/src/pagination/ListAttachedRolePoliciesPaginator.ts
index 430c43a6a553..006e89303c0a 100644
--- a/clients/client-iam/src/pagination/ListAttachedRolePoliciesPaginator.ts
+++ b/clients/client-iam/src/pagination/ListAttachedRolePoliciesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAttachedRolePolicies(
       throw new Error("Invalid client, expected IAM | IAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iam/src/pagination/ListAttachedUserPoliciesPaginator.ts b/clients/client-iam/src/pagination/ListAttachedUserPoliciesPaginator.ts
index a2e3c92dec35..44b263e11c42 100644
--- a/clients/client-iam/src/pagination/ListAttachedUserPoliciesPaginator.ts
+++ b/clients/client-iam/src/pagination/ListAttachedUserPoliciesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAttachedUserPolicies(
       throw new Error("Invalid client, expected IAM | IAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iam/src/pagination/ListEntitiesForPolicyPaginator.ts b/clients/client-iam/src/pagination/ListEntitiesForPolicyPaginator.ts
index 8dc1e98d7c9f..8bc643d5363d 100644
--- a/clients/client-iam/src/pagination/ListEntitiesForPolicyPaginator.ts
+++ b/clients/client-iam/src/pagination/ListEntitiesForPolicyPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEntitiesForPolicy(
       throw new Error("Invalid client, expected IAM | IAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iam/src/pagination/ListGroupPoliciesPaginator.ts b/clients/client-iam/src/pagination/ListGroupPoliciesPaginator.ts
index 6fb4c56546a0..425eb12d384a 100644
--- a/clients/client-iam/src/pagination/ListGroupPoliciesPaginator.ts
+++ b/clients/client-iam/src/pagination/ListGroupPoliciesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListGroupPolicies(
       throw new Error("Invalid client, expected IAM | IAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iam/src/pagination/ListGroupsForUserPaginator.ts b/clients/client-iam/src/pagination/ListGroupsForUserPaginator.ts
index 90d7dbe9fd63..a345ea90cbea 100644
--- a/clients/client-iam/src/pagination/ListGroupsForUserPaginator.ts
+++ b/clients/client-iam/src/pagination/ListGroupsForUserPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListGroupsForUser(
       throw new Error("Invalid client, expected IAM | IAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iam/src/pagination/ListGroupsPaginator.ts b/clients/client-iam/src/pagination/ListGroupsPaginator.ts
index 09be7aeb4a9e..d306e79bf903 100644
--- a/clients/client-iam/src/pagination/ListGroupsPaginator.ts
+++ b/clients/client-iam/src/pagination/ListGroupsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListGroups(
       throw new Error("Invalid client, expected IAM | IAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iam/src/pagination/ListInstanceProfilesForRolePaginator.ts b/clients/client-iam/src/pagination/ListInstanceProfilesForRolePaginator.ts
index 05ec6fbfca9b..0451c16c8d75 100644
--- a/clients/client-iam/src/pagination/ListInstanceProfilesForRolePaginator.ts
+++ b/clients/client-iam/src/pagination/ListInstanceProfilesForRolePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListInstanceProfilesForRole(
       throw new Error("Invalid client, expected IAM | IAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iam/src/pagination/ListInstanceProfilesPaginator.ts b/clients/client-iam/src/pagination/ListInstanceProfilesPaginator.ts
index 931c45fe8fd3..3fddafadbb31 100644
--- a/clients/client-iam/src/pagination/ListInstanceProfilesPaginator.ts
+++ b/clients/client-iam/src/pagination/ListInstanceProfilesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListInstanceProfiles(
       throw new Error("Invalid client, expected IAM | IAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iam/src/pagination/ListMFADevicesPaginator.ts b/clients/client-iam/src/pagination/ListMFADevicesPaginator.ts
index 388e63a4f0e0..4d6d7edd0978 100644
--- a/clients/client-iam/src/pagination/ListMFADevicesPaginator.ts
+++ b/clients/client-iam/src/pagination/ListMFADevicesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListMFADevices(
       throw new Error("Invalid client, expected IAM | IAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iam/src/pagination/ListPoliciesPaginator.ts b/clients/client-iam/src/pagination/ListPoliciesPaginator.ts
index a51f55c794e0..b6f03f370fee 100644
--- a/clients/client-iam/src/pagination/ListPoliciesPaginator.ts
+++ b/clients/client-iam/src/pagination/ListPoliciesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPolicies(
       throw new Error("Invalid client, expected IAM | IAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iam/src/pagination/ListPolicyVersionsPaginator.ts b/clients/client-iam/src/pagination/ListPolicyVersionsPaginator.ts
index ba237a17887f..a952b9546f24 100644
--- a/clients/client-iam/src/pagination/ListPolicyVersionsPaginator.ts
+++ b/clients/client-iam/src/pagination/ListPolicyVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPolicyVersions(
       throw new Error("Invalid client, expected IAM | IAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iam/src/pagination/ListRolePoliciesPaginator.ts b/clients/client-iam/src/pagination/ListRolePoliciesPaginator.ts
index 223d085fa59c..e37717314618 100644
--- a/clients/client-iam/src/pagination/ListRolePoliciesPaginator.ts
+++ b/clients/client-iam/src/pagination/ListRolePoliciesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRolePolicies(
       throw new Error("Invalid client, expected IAM | IAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iam/src/pagination/ListRolesPaginator.ts b/clients/client-iam/src/pagination/ListRolesPaginator.ts
index 8ca9f419d918..7344dae3731b 100644
--- a/clients/client-iam/src/pagination/ListRolesPaginator.ts
+++ b/clients/client-iam/src/pagination/ListRolesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListRoles(
       throw new Error("Invalid client, expected IAM | IAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iam/src/pagination/ListSSHPublicKeysPaginator.ts b/clients/client-iam/src/pagination/ListSSHPublicKeysPaginator.ts
index 113ba699013c..71571b278909 100644
--- a/clients/client-iam/src/pagination/ListSSHPublicKeysPaginator.ts
+++ b/clients/client-iam/src/pagination/ListSSHPublicKeysPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSSHPublicKeys(
       throw new Error("Invalid client, expected IAM | IAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iam/src/pagination/ListServerCertificatesPaginator.ts b/clients/client-iam/src/pagination/ListServerCertificatesPaginator.ts
index 89edde84bda7..7d778662e7da 100644
--- a/clients/client-iam/src/pagination/ListServerCertificatesPaginator.ts
+++ b/clients/client-iam/src/pagination/ListServerCertificatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListServerCertificates(
       throw new Error("Invalid client, expected IAM | IAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iam/src/pagination/ListSigningCertificatesPaginator.ts b/clients/client-iam/src/pagination/ListSigningCertificatesPaginator.ts
index 764b4144d842..c78b96248cf9 100644
--- a/clients/client-iam/src/pagination/ListSigningCertificatesPaginator.ts
+++ b/clients/client-iam/src/pagination/ListSigningCertificatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSigningCertificates(
       throw new Error("Invalid client, expected IAM | IAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iam/src/pagination/ListUserPoliciesPaginator.ts b/clients/client-iam/src/pagination/ListUserPoliciesPaginator.ts
index d9139f6da47c..871dfb6bd91a 100644
--- a/clients/client-iam/src/pagination/ListUserPoliciesPaginator.ts
+++ b/clients/client-iam/src/pagination/ListUserPoliciesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListUserPolicies(
       throw new Error("Invalid client, expected IAM | IAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iam/src/pagination/ListUserTagsPaginator.ts b/clients/client-iam/src/pagination/ListUserTagsPaginator.ts
index 7b3557383c01..67c7962c6c96 100644
--- a/clients/client-iam/src/pagination/ListUserTagsPaginator.ts
+++ b/clients/client-iam/src/pagination/ListUserTagsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListUserTags(
       throw new Error("Invalid client, expected IAM | IAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iam/src/pagination/ListUsersPaginator.ts b/clients/client-iam/src/pagination/ListUsersPaginator.ts
index 8b260ac8e945..15c3068b5f8b 100644
--- a/clients/client-iam/src/pagination/ListUsersPaginator.ts
+++ b/clients/client-iam/src/pagination/ListUsersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListUsers(
       throw new Error("Invalid client, expected IAM | IAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iam/src/pagination/ListVirtualMFADevicesPaginator.ts b/clients/client-iam/src/pagination/ListVirtualMFADevicesPaginator.ts
index c9d304432ce3..53699065f47e 100644
--- a/clients/client-iam/src/pagination/ListVirtualMFADevicesPaginator.ts
+++ b/clients/client-iam/src/pagination/ListVirtualMFADevicesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListVirtualMFADevices(
       throw new Error("Invalid client, expected IAM | IAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iam/src/pagination/SimulateCustomPolicyPaginator.ts b/clients/client-iam/src/pagination/SimulateCustomPolicyPaginator.ts
index 3541cd26299a..588f50f55552 100644
--- a/clients/client-iam/src/pagination/SimulateCustomPolicyPaginator.ts
+++ b/clients/client-iam/src/pagination/SimulateCustomPolicyPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSimulateCustomPolicy(
       throw new Error("Invalid client, expected IAM | IAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iam/src/pagination/SimulatePrincipalPolicyPaginator.ts b/clients/client-iam/src/pagination/SimulatePrincipalPolicyPaginator.ts
index 4cd3212975c7..2bf183b6d953 100644
--- a/clients/client-iam/src/pagination/SimulatePrincipalPolicyPaginator.ts
+++ b/clients/client-iam/src/pagination/SimulatePrincipalPolicyPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSimulatePrincipalPolicy(
       throw new Error("Invalid client, expected IAM | IAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-identitystore/src/pagination/ListGroupsPaginator.ts b/clients/client-identitystore/src/pagination/ListGroupsPaginator.ts
index a873262eab81..ea2c46699655 100644
--- a/clients/client-identitystore/src/pagination/ListGroupsPaginator.ts
+++ b/clients/client-identitystore/src/pagination/ListGroupsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListGroups(
       throw new Error("Invalid client, expected Identitystore | IdentitystoreClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-identitystore/src/pagination/ListUsersPaginator.ts b/clients/client-identitystore/src/pagination/ListUsersPaginator.ts
index e793ab6df3cb..f43e7b3eda03 100644
--- a/clients/client-identitystore/src/pagination/ListUsersPaginator.ts
+++ b/clients/client-identitystore/src/pagination/ListUsersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListUsers(
       throw new Error("Invalid client, expected Identitystore | IdentitystoreClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-imagebuilder/src/pagination/ListComponentBuildVersionsPaginator.ts b/clients/client-imagebuilder/src/pagination/ListComponentBuildVersionsPaginator.ts
index 1264d7b43f88..673dec35bf56 100644
--- a/clients/client-imagebuilder/src/pagination/ListComponentBuildVersionsPaginator.ts
+++ b/clients/client-imagebuilder/src/pagination/ListComponentBuildVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListComponentBuildVersions(
       throw new Error("Invalid client, expected Imagebuilder | ImagebuilderClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-imagebuilder/src/pagination/ListComponentsPaginator.ts b/clients/client-imagebuilder/src/pagination/ListComponentsPaginator.ts
index 063ad68abe2a..ad70743cc755 100644
--- a/clients/client-imagebuilder/src/pagination/ListComponentsPaginator.ts
+++ b/clients/client-imagebuilder/src/pagination/ListComponentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListComponents(
       throw new Error("Invalid client, expected Imagebuilder | ImagebuilderClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-imagebuilder/src/pagination/ListContainerRecipesPaginator.ts b/clients/client-imagebuilder/src/pagination/ListContainerRecipesPaginator.ts
index 643bd4d41b66..be505106d2d8 100644
--- a/clients/client-imagebuilder/src/pagination/ListContainerRecipesPaginator.ts
+++ b/clients/client-imagebuilder/src/pagination/ListContainerRecipesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListContainerRecipes(
       throw new Error("Invalid client, expected Imagebuilder | ImagebuilderClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-imagebuilder/src/pagination/ListDistributionConfigurationsPaginator.ts b/clients/client-imagebuilder/src/pagination/ListDistributionConfigurationsPaginator.ts
index 88e248ac819c..e19029b3ec8a 100644
--- a/clients/client-imagebuilder/src/pagination/ListDistributionConfigurationsPaginator.ts
+++ b/clients/client-imagebuilder/src/pagination/ListDistributionConfigurationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDistributionConfigurations(
       throw new Error("Invalid client, expected Imagebuilder | ImagebuilderClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-imagebuilder/src/pagination/ListImageBuildVersionsPaginator.ts b/clients/client-imagebuilder/src/pagination/ListImageBuildVersionsPaginator.ts
index 7312d936fd67..946f50824ca3 100644
--- a/clients/client-imagebuilder/src/pagination/ListImageBuildVersionsPaginator.ts
+++ b/clients/client-imagebuilder/src/pagination/ListImageBuildVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListImageBuildVersions(
       throw new Error("Invalid client, expected Imagebuilder | ImagebuilderClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-imagebuilder/src/pagination/ListImagePackagesPaginator.ts b/clients/client-imagebuilder/src/pagination/ListImagePackagesPaginator.ts
index 6758904efa3f..6014d59c2ce9 100644
--- a/clients/client-imagebuilder/src/pagination/ListImagePackagesPaginator.ts
+++ b/clients/client-imagebuilder/src/pagination/ListImagePackagesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListImagePackages(
       throw new Error("Invalid client, expected Imagebuilder | ImagebuilderClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-imagebuilder/src/pagination/ListImagePipelineImagesPaginator.ts b/clients/client-imagebuilder/src/pagination/ListImagePipelineImagesPaginator.ts
index 28c55442f8dd..3e49aad96073 100644
--- a/clients/client-imagebuilder/src/pagination/ListImagePipelineImagesPaginator.ts
+++ b/clients/client-imagebuilder/src/pagination/ListImagePipelineImagesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListImagePipelineImages(
       throw new Error("Invalid client, expected Imagebuilder | ImagebuilderClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-imagebuilder/src/pagination/ListImagePipelinesPaginator.ts b/clients/client-imagebuilder/src/pagination/ListImagePipelinesPaginator.ts
index a56996a3e3f1..a67f94a3b94f 100644
--- a/clients/client-imagebuilder/src/pagination/ListImagePipelinesPaginator.ts
+++ b/clients/client-imagebuilder/src/pagination/ListImagePipelinesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListImagePipelines(
       throw new Error("Invalid client, expected Imagebuilder | ImagebuilderClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-imagebuilder/src/pagination/ListImageRecipesPaginator.ts b/clients/client-imagebuilder/src/pagination/ListImageRecipesPaginator.ts
index e5a67d69f22f..f7f70842086d 100644
--- a/clients/client-imagebuilder/src/pagination/ListImageRecipesPaginator.ts
+++ b/clients/client-imagebuilder/src/pagination/ListImageRecipesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListImageRecipes(
       throw new Error("Invalid client, expected Imagebuilder | ImagebuilderClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-imagebuilder/src/pagination/ListImagesPaginator.ts b/clients/client-imagebuilder/src/pagination/ListImagesPaginator.ts
index e3e3d4d53085..d4ff8222bceb 100644
--- a/clients/client-imagebuilder/src/pagination/ListImagesPaginator.ts
+++ b/clients/client-imagebuilder/src/pagination/ListImagesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListImages(
       throw new Error("Invalid client, expected Imagebuilder | ImagebuilderClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-imagebuilder/src/pagination/ListInfrastructureConfigurationsPaginator.ts b/clients/client-imagebuilder/src/pagination/ListInfrastructureConfigurationsPaginator.ts
index 843e4d69f6e2..109a3c76cb79 100644
--- a/clients/client-imagebuilder/src/pagination/ListInfrastructureConfigurationsPaginator.ts
+++ b/clients/client-imagebuilder/src/pagination/ListInfrastructureConfigurationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListInfrastructureConfigurations(
       throw new Error("Invalid client, expected Imagebuilder | ImagebuilderClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-inspector/src/pagination/GetExclusionsPreviewPaginator.ts b/clients/client-inspector/src/pagination/GetExclusionsPreviewPaginator.ts
index 2c3ad6a2a257..10951cb5b8fc 100644
--- a/clients/client-inspector/src/pagination/GetExclusionsPreviewPaginator.ts
+++ b/clients/client-inspector/src/pagination/GetExclusionsPreviewPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetExclusionsPreview(
       throw new Error("Invalid client, expected Inspector | InspectorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-inspector/src/pagination/ListAssessmentRunAgentsPaginator.ts b/clients/client-inspector/src/pagination/ListAssessmentRunAgentsPaginator.ts
index c69ee1f7fa09..5f30520e44bd 100644
--- a/clients/client-inspector/src/pagination/ListAssessmentRunAgentsPaginator.ts
+++ b/clients/client-inspector/src/pagination/ListAssessmentRunAgentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAssessmentRunAgents(
       throw new Error("Invalid client, expected Inspector | InspectorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-inspector/src/pagination/ListAssessmentRunsPaginator.ts b/clients/client-inspector/src/pagination/ListAssessmentRunsPaginator.ts
index 471acaf8a7a1..5a31cbbc8716 100644
--- a/clients/client-inspector/src/pagination/ListAssessmentRunsPaginator.ts
+++ b/clients/client-inspector/src/pagination/ListAssessmentRunsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAssessmentRuns(
       throw new Error("Invalid client, expected Inspector | InspectorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-inspector/src/pagination/ListAssessmentTargetsPaginator.ts b/clients/client-inspector/src/pagination/ListAssessmentTargetsPaginator.ts
index ac39a658ab59..511d03b75d7c 100644
--- a/clients/client-inspector/src/pagination/ListAssessmentTargetsPaginator.ts
+++ b/clients/client-inspector/src/pagination/ListAssessmentTargetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAssessmentTargets(
       throw new Error("Invalid client, expected Inspector | InspectorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-inspector/src/pagination/ListAssessmentTemplatesPaginator.ts b/clients/client-inspector/src/pagination/ListAssessmentTemplatesPaginator.ts
index e79af330220c..39a1971bc509 100644
--- a/clients/client-inspector/src/pagination/ListAssessmentTemplatesPaginator.ts
+++ b/clients/client-inspector/src/pagination/ListAssessmentTemplatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAssessmentTemplates(
       throw new Error("Invalid client, expected Inspector | InspectorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-inspector/src/pagination/ListEventSubscriptionsPaginator.ts b/clients/client-inspector/src/pagination/ListEventSubscriptionsPaginator.ts
index 8a1a93b62bb3..58a2299da4a8 100644
--- a/clients/client-inspector/src/pagination/ListEventSubscriptionsPaginator.ts
+++ b/clients/client-inspector/src/pagination/ListEventSubscriptionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEventSubscriptions(
       throw new Error("Invalid client, expected Inspector | InspectorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-inspector/src/pagination/ListExclusionsPaginator.ts b/clients/client-inspector/src/pagination/ListExclusionsPaginator.ts
index 5c030f6c5eae..c405ea464df8 100644
--- a/clients/client-inspector/src/pagination/ListExclusionsPaginator.ts
+++ b/clients/client-inspector/src/pagination/ListExclusionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListExclusions(
       throw new Error("Invalid client, expected Inspector | InspectorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-inspector/src/pagination/ListFindingsPaginator.ts b/clients/client-inspector/src/pagination/ListFindingsPaginator.ts
index 9bb62c8825f6..db76fd93f7e1 100644
--- a/clients/client-inspector/src/pagination/ListFindingsPaginator.ts
+++ b/clients/client-inspector/src/pagination/ListFindingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFindings(
       throw new Error("Invalid client, expected Inspector | InspectorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-inspector/src/pagination/ListRulesPackagesPaginator.ts b/clients/client-inspector/src/pagination/ListRulesPackagesPaginator.ts
index b2bf098291d3..02d8fe4b6834 100644
--- a/clients/client-inspector/src/pagination/ListRulesPackagesPaginator.ts
+++ b/clients/client-inspector/src/pagination/ListRulesPackagesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRulesPackages(
       throw new Error("Invalid client, expected Inspector | InspectorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-inspector/src/pagination/PreviewAgentsPaginator.ts b/clients/client-inspector/src/pagination/PreviewAgentsPaginator.ts
index 11c348322f80..78a5a329928a 100644
--- a/clients/client-inspector/src/pagination/PreviewAgentsPaginator.ts
+++ b/clients/client-inspector/src/pagination/PreviewAgentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginatePreviewAgents(
       throw new Error("Invalid client, expected Inspector | InspectorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-inspector2/src/pagination/ListAccountPermissionsPaginator.ts b/clients/client-inspector2/src/pagination/ListAccountPermissionsPaginator.ts
index 62538c6bca1d..c1d397f001dd 100644
--- a/clients/client-inspector2/src/pagination/ListAccountPermissionsPaginator.ts
+++ b/clients/client-inspector2/src/pagination/ListAccountPermissionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAccountPermissions(
       throw new Error("Invalid client, expected Inspector2 | Inspector2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-inspector2/src/pagination/ListCoveragePaginator.ts b/clients/client-inspector2/src/pagination/ListCoveragePaginator.ts
index 5c3b7c85740b..a6a70b399058 100644
--- a/clients/client-inspector2/src/pagination/ListCoveragePaginator.ts
+++ b/clients/client-inspector2/src/pagination/ListCoveragePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCoverage(
       throw new Error("Invalid client, expected Inspector2 | Inspector2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-inspector2/src/pagination/ListCoverageStatisticsPaginator.ts b/clients/client-inspector2/src/pagination/ListCoverageStatisticsPaginator.ts
index 69cf8cec2166..e8eb66ee0594 100644
--- a/clients/client-inspector2/src/pagination/ListCoverageStatisticsPaginator.ts
+++ b/clients/client-inspector2/src/pagination/ListCoverageStatisticsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListCoverageStatistics(
       throw new Error("Invalid client, expected Inspector2 | Inspector2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-inspector2/src/pagination/ListDelegatedAdminAccountsPaginator.ts b/clients/client-inspector2/src/pagination/ListDelegatedAdminAccountsPaginator.ts
index bc986d06c9d8..e2713cd52edf 100644
--- a/clients/client-inspector2/src/pagination/ListDelegatedAdminAccountsPaginator.ts
+++ b/clients/client-inspector2/src/pagination/ListDelegatedAdminAccountsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDelegatedAdminAccounts(
       throw new Error("Invalid client, expected Inspector2 | Inspector2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-inspector2/src/pagination/ListFiltersPaginator.ts b/clients/client-inspector2/src/pagination/ListFiltersPaginator.ts
index cc223fed90f2..a54b92f0abff 100644
--- a/clients/client-inspector2/src/pagination/ListFiltersPaginator.ts
+++ b/clients/client-inspector2/src/pagination/ListFiltersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListFilters(
       throw new Error("Invalid client, expected Inspector2 | Inspector2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-inspector2/src/pagination/ListFindingAggregationsPaginator.ts b/clients/client-inspector2/src/pagination/ListFindingAggregationsPaginator.ts
index 5f62dd2765df..cdd0f7bbc0e3 100644
--- a/clients/client-inspector2/src/pagination/ListFindingAggregationsPaginator.ts
+++ b/clients/client-inspector2/src/pagination/ListFindingAggregationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFindingAggregations(
       throw new Error("Invalid client, expected Inspector2 | Inspector2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-inspector2/src/pagination/ListFindingsPaginator.ts b/clients/client-inspector2/src/pagination/ListFindingsPaginator.ts
index 82790b454fa3..9387c117a56d 100644
--- a/clients/client-inspector2/src/pagination/ListFindingsPaginator.ts
+++ b/clients/client-inspector2/src/pagination/ListFindingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFindings(
       throw new Error("Invalid client, expected Inspector2 | Inspector2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-inspector2/src/pagination/ListMembersPaginator.ts b/clients/client-inspector2/src/pagination/ListMembersPaginator.ts
index e8b3b59ab216..606f849755a9 100644
--- a/clients/client-inspector2/src/pagination/ListMembersPaginator.ts
+++ b/clients/client-inspector2/src/pagination/ListMembersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListMembers(
       throw new Error("Invalid client, expected Inspector2 | Inspector2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-inspector2/src/pagination/ListUsageTotalsPaginator.ts b/clients/client-inspector2/src/pagination/ListUsageTotalsPaginator.ts
index aeb33d284a5f..cb1ac9f8fcdf 100644
--- a/clients/client-inspector2/src/pagination/ListUsageTotalsPaginator.ts
+++ b/clients/client-inspector2/src/pagination/ListUsageTotalsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListUsageTotals(
       throw new Error("Invalid client, expected Inspector2 | Inspector2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot-1click-projects/src/pagination/ListPlacementsPaginator.ts b/clients/client-iot-1click-projects/src/pagination/ListPlacementsPaginator.ts
index dfce1084d60d..60ebee5b8c24 100644
--- a/clients/client-iot-1click-projects/src/pagination/ListPlacementsPaginator.ts
+++ b/clients/client-iot-1click-projects/src/pagination/ListPlacementsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPlacements(
       throw new Error("Invalid client, expected IoT1ClickProjects | IoT1ClickProjectsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot-1click-projects/src/pagination/ListProjectsPaginator.ts b/clients/client-iot-1click-projects/src/pagination/ListProjectsPaginator.ts
index a530870ad798..1ee60174e327 100644
--- a/clients/client-iot-1click-projects/src/pagination/ListProjectsPaginator.ts
+++ b/clients/client-iot-1click-projects/src/pagination/ListProjectsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListProjects(
       throw new Error("Invalid client, expected IoT1ClickProjects | IoT1ClickProjectsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot-data-plane/src/pagination/ListRetainedMessagesPaginator.ts b/clients/client-iot-data-plane/src/pagination/ListRetainedMessagesPaginator.ts
index 3160280fa941..379b3e815e88 100644
--- a/clients/client-iot-data-plane/src/pagination/ListRetainedMessagesPaginator.ts
+++ b/clients/client-iot-data-plane/src/pagination/ListRetainedMessagesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRetainedMessages(
       throw new Error("Invalid client, expected IoTDataPlane | IoTDataPlaneClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot-wireless/src/pagination/ListDestinationsPaginator.ts b/clients/client-iot-wireless/src/pagination/ListDestinationsPaginator.ts
index e46dd288e633..45b6125111e3 100644
--- a/clients/client-iot-wireless/src/pagination/ListDestinationsPaginator.ts
+++ b/clients/client-iot-wireless/src/pagination/ListDestinationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDestinations(
       throw new Error("Invalid client, expected IoTWireless | IoTWirelessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot-wireless/src/pagination/ListDeviceProfilesPaginator.ts b/clients/client-iot-wireless/src/pagination/ListDeviceProfilesPaginator.ts
index b3972ba9763d..bd9845687e82 100644
--- a/clients/client-iot-wireless/src/pagination/ListDeviceProfilesPaginator.ts
+++ b/clients/client-iot-wireless/src/pagination/ListDeviceProfilesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDeviceProfiles(
       throw new Error("Invalid client, expected IoTWireless | IoTWirelessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot-wireless/src/pagination/ListFuotaTasksPaginator.ts b/clients/client-iot-wireless/src/pagination/ListFuotaTasksPaginator.ts
index bc0e74ea3ff2..bf08fe034904 100644
--- a/clients/client-iot-wireless/src/pagination/ListFuotaTasksPaginator.ts
+++ b/clients/client-iot-wireless/src/pagination/ListFuotaTasksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFuotaTasks(
       throw new Error("Invalid client, expected IoTWireless | IoTWirelessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot-wireless/src/pagination/ListMulticastGroupsByFuotaTaskPaginator.ts b/clients/client-iot-wireless/src/pagination/ListMulticastGroupsByFuotaTaskPaginator.ts
index d36d89677000..792936c26ce5 100644
--- a/clients/client-iot-wireless/src/pagination/ListMulticastGroupsByFuotaTaskPaginator.ts
+++ b/clients/client-iot-wireless/src/pagination/ListMulticastGroupsByFuotaTaskPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListMulticastGroupsByFuotaTask(
       throw new Error("Invalid client, expected IoTWireless | IoTWirelessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot-wireless/src/pagination/ListMulticastGroupsPaginator.ts b/clients/client-iot-wireless/src/pagination/ListMulticastGroupsPaginator.ts
index 4dabeb77a7d2..5b12038dfb09 100644
--- a/clients/client-iot-wireless/src/pagination/ListMulticastGroupsPaginator.ts
+++ b/clients/client-iot-wireless/src/pagination/ListMulticastGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListMulticastGroups(
       throw new Error("Invalid client, expected IoTWireless | IoTWirelessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot-wireless/src/pagination/ListQueuedMessagesPaginator.ts b/clients/client-iot-wireless/src/pagination/ListQueuedMessagesPaginator.ts
index 3c15c862f18e..af9d71a8d146 100644
--- a/clients/client-iot-wireless/src/pagination/ListQueuedMessagesPaginator.ts
+++ b/clients/client-iot-wireless/src/pagination/ListQueuedMessagesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListQueuedMessages(
       throw new Error("Invalid client, expected IoTWireless | IoTWirelessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot-wireless/src/pagination/ListServiceProfilesPaginator.ts b/clients/client-iot-wireless/src/pagination/ListServiceProfilesPaginator.ts
index b8338443cf75..ad581882a717 100644
--- a/clients/client-iot-wireless/src/pagination/ListServiceProfilesPaginator.ts
+++ b/clients/client-iot-wireless/src/pagination/ListServiceProfilesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListServiceProfiles(
       throw new Error("Invalid client, expected IoTWireless | IoTWirelessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot-wireless/src/pagination/ListWirelessDevicesPaginator.ts b/clients/client-iot-wireless/src/pagination/ListWirelessDevicesPaginator.ts
index 52642665a55a..c64051720e50 100644
--- a/clients/client-iot-wireless/src/pagination/ListWirelessDevicesPaginator.ts
+++ b/clients/client-iot-wireless/src/pagination/ListWirelessDevicesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListWirelessDevices(
       throw new Error("Invalid client, expected IoTWireless | IoTWirelessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot-wireless/src/pagination/ListWirelessGatewaysPaginator.ts b/clients/client-iot-wireless/src/pagination/ListWirelessGatewaysPaginator.ts
index 82b03d9ceb56..b2dda298cc40 100644
--- a/clients/client-iot-wireless/src/pagination/ListWirelessGatewaysPaginator.ts
+++ b/clients/client-iot-wireless/src/pagination/ListWirelessGatewaysPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListWirelessGateways(
       throw new Error("Invalid client, expected IoTWireless | IoTWirelessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/GetBehaviorModelTrainingSummariesPaginator.ts b/clients/client-iot/src/pagination/GetBehaviorModelTrainingSummariesPaginator.ts
index 7cf65f5c85e0..b78f6de4d0bc 100644
--- a/clients/client-iot/src/pagination/GetBehaviorModelTrainingSummariesPaginator.ts
+++ b/clients/client-iot/src/pagination/GetBehaviorModelTrainingSummariesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetBehaviorModelTrainingSummaries(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListActiveViolationsPaginator.ts b/clients/client-iot/src/pagination/ListActiveViolationsPaginator.ts
index 2782c5ad1f8a..0fea0a0a8b50 100644
--- a/clients/client-iot/src/pagination/ListActiveViolationsPaginator.ts
+++ b/clients/client-iot/src/pagination/ListActiveViolationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListActiveViolations(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListAttachedPoliciesPaginator.ts b/clients/client-iot/src/pagination/ListAttachedPoliciesPaginator.ts
index 5d54670f0417..5cef0931c4a0 100644
--- a/clients/client-iot/src/pagination/ListAttachedPoliciesPaginator.ts
+++ b/clients/client-iot/src/pagination/ListAttachedPoliciesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAttachedPolicies(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListAuditFindingsPaginator.ts b/clients/client-iot/src/pagination/ListAuditFindingsPaginator.ts
index afc0c7d0ce05..1517c036eae1 100644
--- a/clients/client-iot/src/pagination/ListAuditFindingsPaginator.ts
+++ b/clients/client-iot/src/pagination/ListAuditFindingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAuditFindings(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListAuditMitigationActionsExecutionsPaginator.ts b/clients/client-iot/src/pagination/ListAuditMitigationActionsExecutionsPaginator.ts
index 008db1b40a30..416c345bb1e0 100644
--- a/clients/client-iot/src/pagination/ListAuditMitigationActionsExecutionsPaginator.ts
+++ b/clients/client-iot/src/pagination/ListAuditMitigationActionsExecutionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAuditMitigationActionsExecutions(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListAuditMitigationActionsTasksPaginator.ts b/clients/client-iot/src/pagination/ListAuditMitigationActionsTasksPaginator.ts
index 7d426a423b75..3e27f27e5d09 100644
--- a/clients/client-iot/src/pagination/ListAuditMitigationActionsTasksPaginator.ts
+++ b/clients/client-iot/src/pagination/ListAuditMitigationActionsTasksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAuditMitigationActionsTasks(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListAuditSuppressionsPaginator.ts b/clients/client-iot/src/pagination/ListAuditSuppressionsPaginator.ts
index 2866126f7af7..9f0109d9f8ad 100644
--- a/clients/client-iot/src/pagination/ListAuditSuppressionsPaginator.ts
+++ b/clients/client-iot/src/pagination/ListAuditSuppressionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAuditSuppressions(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListAuditTasksPaginator.ts b/clients/client-iot/src/pagination/ListAuditTasksPaginator.ts
index 096c1ef51f36..30e8d252a963 100644
--- a/clients/client-iot/src/pagination/ListAuditTasksPaginator.ts
+++ b/clients/client-iot/src/pagination/ListAuditTasksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAuditTasks(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListAuthorizersPaginator.ts b/clients/client-iot/src/pagination/ListAuthorizersPaginator.ts
index 4bf8682e706d..a975f522bd11 100644
--- a/clients/client-iot/src/pagination/ListAuthorizersPaginator.ts
+++ b/clients/client-iot/src/pagination/ListAuthorizersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAuthorizers(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListBillingGroupsPaginator.ts b/clients/client-iot/src/pagination/ListBillingGroupsPaginator.ts
index a2b8584b294d..7b84f2217e45 100644
--- a/clients/client-iot/src/pagination/ListBillingGroupsPaginator.ts
+++ b/clients/client-iot/src/pagination/ListBillingGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListBillingGroups(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListCACertificatesPaginator.ts b/clients/client-iot/src/pagination/ListCACertificatesPaginator.ts
index c88b00e3614a..81e5bb5b82bf 100644
--- a/clients/client-iot/src/pagination/ListCACertificatesPaginator.ts
+++ b/clients/client-iot/src/pagination/ListCACertificatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCACertificates(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListCertificatesByCAPaginator.ts b/clients/client-iot/src/pagination/ListCertificatesByCAPaginator.ts
index 51553f03feda..2c4d822a089e 100644
--- a/clients/client-iot/src/pagination/ListCertificatesByCAPaginator.ts
+++ b/clients/client-iot/src/pagination/ListCertificatesByCAPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCertificatesByCA(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListCertificatesPaginator.ts b/clients/client-iot/src/pagination/ListCertificatesPaginator.ts
index e93634fa2e31..326916a29090 100644
--- a/clients/client-iot/src/pagination/ListCertificatesPaginator.ts
+++ b/clients/client-iot/src/pagination/ListCertificatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCertificates(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListCustomMetricsPaginator.ts b/clients/client-iot/src/pagination/ListCustomMetricsPaginator.ts
index 562c960c332b..765f5d791693 100644
--- a/clients/client-iot/src/pagination/ListCustomMetricsPaginator.ts
+++ b/clients/client-iot/src/pagination/ListCustomMetricsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCustomMetrics(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListDetectMitigationActionsExecutionsPaginator.ts b/clients/client-iot/src/pagination/ListDetectMitigationActionsExecutionsPaginator.ts
index 323ee777be03..c45ba441efbd 100644
--- a/clients/client-iot/src/pagination/ListDetectMitigationActionsExecutionsPaginator.ts
+++ b/clients/client-iot/src/pagination/ListDetectMitigationActionsExecutionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDetectMitigationActionsExecutions(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListDetectMitigationActionsTasksPaginator.ts b/clients/client-iot/src/pagination/ListDetectMitigationActionsTasksPaginator.ts
index 8c08aafb05fc..f6d5a4d22df4 100644
--- a/clients/client-iot/src/pagination/ListDetectMitigationActionsTasksPaginator.ts
+++ b/clients/client-iot/src/pagination/ListDetectMitigationActionsTasksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDetectMitigationActionsTasks(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListDimensionsPaginator.ts b/clients/client-iot/src/pagination/ListDimensionsPaginator.ts
index 55ee35f9d384..154f32b8fae4 100644
--- a/clients/client-iot/src/pagination/ListDimensionsPaginator.ts
+++ b/clients/client-iot/src/pagination/ListDimensionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDimensions(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListDomainConfigurationsPaginator.ts b/clients/client-iot/src/pagination/ListDomainConfigurationsPaginator.ts
index d1284be0c1ae..ad4ef97198f0 100644
--- a/clients/client-iot/src/pagination/ListDomainConfigurationsPaginator.ts
+++ b/clients/client-iot/src/pagination/ListDomainConfigurationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDomainConfigurations(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListFleetMetricsPaginator.ts b/clients/client-iot/src/pagination/ListFleetMetricsPaginator.ts
index 2ad161b701bd..4fb7b4a4e12f 100644
--- a/clients/client-iot/src/pagination/ListFleetMetricsPaginator.ts
+++ b/clients/client-iot/src/pagination/ListFleetMetricsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFleetMetrics(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListIndicesPaginator.ts b/clients/client-iot/src/pagination/ListIndicesPaginator.ts
index 5a5ec0c24bc1..81efaf9a3895 100644
--- a/clients/client-iot/src/pagination/ListIndicesPaginator.ts
+++ b/clients/client-iot/src/pagination/ListIndicesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListIndices(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListJobExecutionsForJobPaginator.ts b/clients/client-iot/src/pagination/ListJobExecutionsForJobPaginator.ts
index 7ee4f5c09cbe..320d1451a292 100644
--- a/clients/client-iot/src/pagination/ListJobExecutionsForJobPaginator.ts
+++ b/clients/client-iot/src/pagination/ListJobExecutionsForJobPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListJobExecutionsForJob(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListJobExecutionsForThingPaginator.ts b/clients/client-iot/src/pagination/ListJobExecutionsForThingPaginator.ts
index ca4ab682bd16..86409190fb32 100644
--- a/clients/client-iot/src/pagination/ListJobExecutionsForThingPaginator.ts
+++ b/clients/client-iot/src/pagination/ListJobExecutionsForThingPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListJobExecutionsForThing(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListJobTemplatesPaginator.ts b/clients/client-iot/src/pagination/ListJobTemplatesPaginator.ts
index 30a65fa2e395..f5a7ef40df92 100644
--- a/clients/client-iot/src/pagination/ListJobTemplatesPaginator.ts
+++ b/clients/client-iot/src/pagination/ListJobTemplatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListJobTemplates(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListJobsPaginator.ts b/clients/client-iot/src/pagination/ListJobsPaginator.ts
index 8136889e31ca..b4001251d3cb 100644
--- a/clients/client-iot/src/pagination/ListJobsPaginator.ts
+++ b/clients/client-iot/src/pagination/ListJobsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListJobs(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListMetricValuesPaginator.ts b/clients/client-iot/src/pagination/ListMetricValuesPaginator.ts
index f6c9ef99dd3b..06d36f6e7280 100644
--- a/clients/client-iot/src/pagination/ListMetricValuesPaginator.ts
+++ b/clients/client-iot/src/pagination/ListMetricValuesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListMetricValues(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListMitigationActionsPaginator.ts b/clients/client-iot/src/pagination/ListMitigationActionsPaginator.ts
index 0fce1ddc5924..185ca6dc3f1f 100644
--- a/clients/client-iot/src/pagination/ListMitigationActionsPaginator.ts
+++ b/clients/client-iot/src/pagination/ListMitigationActionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListMitigationActions(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListOTAUpdatesPaginator.ts b/clients/client-iot/src/pagination/ListOTAUpdatesPaginator.ts
index 9f66db68b1aa..3f27dda22ddb 100644
--- a/clients/client-iot/src/pagination/ListOTAUpdatesPaginator.ts
+++ b/clients/client-iot/src/pagination/ListOTAUpdatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListOTAUpdates(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListOutgoingCertificatesPaginator.ts b/clients/client-iot/src/pagination/ListOutgoingCertificatesPaginator.ts
index cfafd228f941..9693e58711b6 100644
--- a/clients/client-iot/src/pagination/ListOutgoingCertificatesPaginator.ts
+++ b/clients/client-iot/src/pagination/ListOutgoingCertificatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListOutgoingCertificates(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListPoliciesPaginator.ts b/clients/client-iot/src/pagination/ListPoliciesPaginator.ts
index dfcd63910f99..b2a1544f1f0d 100644
--- a/clients/client-iot/src/pagination/ListPoliciesPaginator.ts
+++ b/clients/client-iot/src/pagination/ListPoliciesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPolicies(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListPolicyPrincipalsPaginator.ts b/clients/client-iot/src/pagination/ListPolicyPrincipalsPaginator.ts
index 048c05dd9dc5..dae1f75ab5fd 100644
--- a/clients/client-iot/src/pagination/ListPolicyPrincipalsPaginator.ts
+++ b/clients/client-iot/src/pagination/ListPolicyPrincipalsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPolicyPrincipals(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListPrincipalPoliciesPaginator.ts b/clients/client-iot/src/pagination/ListPrincipalPoliciesPaginator.ts
index 4365ef410580..4e2b3c6f6cbf 100644
--- a/clients/client-iot/src/pagination/ListPrincipalPoliciesPaginator.ts
+++ b/clients/client-iot/src/pagination/ListPrincipalPoliciesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPrincipalPolicies(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListPrincipalThingsPaginator.ts b/clients/client-iot/src/pagination/ListPrincipalThingsPaginator.ts
index 21a4855a1731..8625c78d26ec 100644
--- a/clients/client-iot/src/pagination/ListPrincipalThingsPaginator.ts
+++ b/clients/client-iot/src/pagination/ListPrincipalThingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPrincipalThings(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListProvisioningTemplateVersionsPaginator.ts b/clients/client-iot/src/pagination/ListProvisioningTemplateVersionsPaginator.ts
index cc8e53ee81e1..606e53f9ee77 100644
--- a/clients/client-iot/src/pagination/ListProvisioningTemplateVersionsPaginator.ts
+++ b/clients/client-iot/src/pagination/ListProvisioningTemplateVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListProvisioningTemplateVersions(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListProvisioningTemplatesPaginator.ts b/clients/client-iot/src/pagination/ListProvisioningTemplatesPaginator.ts
index 3e32970e9b8c..0ee60baac97c 100644
--- a/clients/client-iot/src/pagination/ListProvisioningTemplatesPaginator.ts
+++ b/clients/client-iot/src/pagination/ListProvisioningTemplatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListProvisioningTemplates(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListRoleAliasesPaginator.ts b/clients/client-iot/src/pagination/ListRoleAliasesPaginator.ts
index a17a7b5737ba..770d8550f562 100644
--- a/clients/client-iot/src/pagination/ListRoleAliasesPaginator.ts
+++ b/clients/client-iot/src/pagination/ListRoleAliasesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRoleAliases(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListScheduledAuditsPaginator.ts b/clients/client-iot/src/pagination/ListScheduledAuditsPaginator.ts
index 4e943aa7ace4..53fe1bd40b30 100644
--- a/clients/client-iot/src/pagination/ListScheduledAuditsPaginator.ts
+++ b/clients/client-iot/src/pagination/ListScheduledAuditsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListScheduledAudits(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListSecurityProfilesForTargetPaginator.ts b/clients/client-iot/src/pagination/ListSecurityProfilesForTargetPaginator.ts
index 6f3e2d056418..19946c5db57d 100644
--- a/clients/client-iot/src/pagination/ListSecurityProfilesForTargetPaginator.ts
+++ b/clients/client-iot/src/pagination/ListSecurityProfilesForTargetPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSecurityProfilesForTarget(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListSecurityProfilesPaginator.ts b/clients/client-iot/src/pagination/ListSecurityProfilesPaginator.ts
index 0d2b46e27c7b..d0b8c6679d01 100644
--- a/clients/client-iot/src/pagination/ListSecurityProfilesPaginator.ts
+++ b/clients/client-iot/src/pagination/ListSecurityProfilesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSecurityProfiles(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListStreamsPaginator.ts b/clients/client-iot/src/pagination/ListStreamsPaginator.ts
index 6b39917b8717..8e0d2659c393 100644
--- a/clients/client-iot/src/pagination/ListStreamsPaginator.ts
+++ b/clients/client-iot/src/pagination/ListStreamsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListStreams(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListTagsForResourcePaginator.ts b/clients/client-iot/src/pagination/ListTagsForResourcePaginator.ts
index 113260e353e5..7a599c8779c5 100644
--- a/clients/client-iot/src/pagination/ListTagsForResourcePaginator.ts
+++ b/clients/client-iot/src/pagination/ListTagsForResourcePaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListTagsForResource(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListTargetsForPolicyPaginator.ts b/clients/client-iot/src/pagination/ListTargetsForPolicyPaginator.ts
index 6a8faf2d7134..d314ec6ac9e5 100644
--- a/clients/client-iot/src/pagination/ListTargetsForPolicyPaginator.ts
+++ b/clients/client-iot/src/pagination/ListTargetsForPolicyPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTargetsForPolicy(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListTargetsForSecurityProfilePaginator.ts b/clients/client-iot/src/pagination/ListTargetsForSecurityProfilePaginator.ts
index 6a20896d239b..08b2bc37fcd2 100644
--- a/clients/client-iot/src/pagination/ListTargetsForSecurityProfilePaginator.ts
+++ b/clients/client-iot/src/pagination/ListTargetsForSecurityProfilePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTargetsForSecurityProfile(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListThingGroupsForThingPaginator.ts b/clients/client-iot/src/pagination/ListThingGroupsForThingPaginator.ts
index c1ab4205c94e..074a679ef34f 100644
--- a/clients/client-iot/src/pagination/ListThingGroupsForThingPaginator.ts
+++ b/clients/client-iot/src/pagination/ListThingGroupsForThingPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListThingGroupsForThing(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListThingGroupsPaginator.ts b/clients/client-iot/src/pagination/ListThingGroupsPaginator.ts
index 3496e368fb5c..e037376e0e77 100644
--- a/clients/client-iot/src/pagination/ListThingGroupsPaginator.ts
+++ b/clients/client-iot/src/pagination/ListThingGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListThingGroups(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListThingPrincipalsPaginator.ts b/clients/client-iot/src/pagination/ListThingPrincipalsPaginator.ts
index 94a8e5793078..fcae27ed74a4 100644
--- a/clients/client-iot/src/pagination/ListThingPrincipalsPaginator.ts
+++ b/clients/client-iot/src/pagination/ListThingPrincipalsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListThingPrincipals(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListThingRegistrationTaskReportsPaginator.ts b/clients/client-iot/src/pagination/ListThingRegistrationTaskReportsPaginator.ts
index 578e5c0d9c94..19bf865e4469 100644
--- a/clients/client-iot/src/pagination/ListThingRegistrationTaskReportsPaginator.ts
+++ b/clients/client-iot/src/pagination/ListThingRegistrationTaskReportsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListThingRegistrationTaskReports(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListThingRegistrationTasksPaginator.ts b/clients/client-iot/src/pagination/ListThingRegistrationTasksPaginator.ts
index 9301d71be89f..80ef36333eab 100644
--- a/clients/client-iot/src/pagination/ListThingRegistrationTasksPaginator.ts
+++ b/clients/client-iot/src/pagination/ListThingRegistrationTasksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListThingRegistrationTasks(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListThingTypesPaginator.ts b/clients/client-iot/src/pagination/ListThingTypesPaginator.ts
index 6abea47ec59d..39795f64849e 100644
--- a/clients/client-iot/src/pagination/ListThingTypesPaginator.ts
+++ b/clients/client-iot/src/pagination/ListThingTypesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListThingTypes(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListThingsInBillingGroupPaginator.ts b/clients/client-iot/src/pagination/ListThingsInBillingGroupPaginator.ts
index f33b08569d6e..12d7c77ccbc3 100644
--- a/clients/client-iot/src/pagination/ListThingsInBillingGroupPaginator.ts
+++ b/clients/client-iot/src/pagination/ListThingsInBillingGroupPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListThingsInBillingGroup(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListThingsInThingGroupPaginator.ts b/clients/client-iot/src/pagination/ListThingsInThingGroupPaginator.ts
index 496bcca5cecb..deaceacbca37 100644
--- a/clients/client-iot/src/pagination/ListThingsInThingGroupPaginator.ts
+++ b/clients/client-iot/src/pagination/ListThingsInThingGroupPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListThingsInThingGroup(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListThingsPaginator.ts b/clients/client-iot/src/pagination/ListThingsPaginator.ts
index d690ddcfe9ed..43a85b5dd034 100644
--- a/clients/client-iot/src/pagination/ListThingsPaginator.ts
+++ b/clients/client-iot/src/pagination/ListThingsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListThings(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListTopicRuleDestinationsPaginator.ts b/clients/client-iot/src/pagination/ListTopicRuleDestinationsPaginator.ts
index 015ff3d893b1..11efd1b1afb5 100644
--- a/clients/client-iot/src/pagination/ListTopicRuleDestinationsPaginator.ts
+++ b/clients/client-iot/src/pagination/ListTopicRuleDestinationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTopicRuleDestinations(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListTopicRulesPaginator.ts b/clients/client-iot/src/pagination/ListTopicRulesPaginator.ts
index a97224005103..dfb89ef0c52a 100644
--- a/clients/client-iot/src/pagination/ListTopicRulesPaginator.ts
+++ b/clients/client-iot/src/pagination/ListTopicRulesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTopicRules(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListV2LoggingLevelsPaginator.ts b/clients/client-iot/src/pagination/ListV2LoggingLevelsPaginator.ts
index cfe5f57276a1..75f7e1544e4a 100644
--- a/clients/client-iot/src/pagination/ListV2LoggingLevelsPaginator.ts
+++ b/clients/client-iot/src/pagination/ListV2LoggingLevelsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListV2LoggingLevels(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iot/src/pagination/ListViolationEventsPaginator.ts b/clients/client-iot/src/pagination/ListViolationEventsPaginator.ts
index cda0a3fd2c38..b83c9e2dde55 100644
--- a/clients/client-iot/src/pagination/ListViolationEventsPaginator.ts
+++ b/clients/client-iot/src/pagination/ListViolationEventsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListViolationEvents(
       throw new Error("Invalid client, expected IoT | IoTClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotanalytics/src/pagination/ListChannelsPaginator.ts b/clients/client-iotanalytics/src/pagination/ListChannelsPaginator.ts
index bfb623fe8c2e..93e482af88aa 100644
--- a/clients/client-iotanalytics/src/pagination/ListChannelsPaginator.ts
+++ b/clients/client-iotanalytics/src/pagination/ListChannelsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListChannels(
       throw new Error("Invalid client, expected IoTAnalytics | IoTAnalyticsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotanalytics/src/pagination/ListDatasetContentsPaginator.ts b/clients/client-iotanalytics/src/pagination/ListDatasetContentsPaginator.ts
index dfd45134906f..0df637b1d633 100644
--- a/clients/client-iotanalytics/src/pagination/ListDatasetContentsPaginator.ts
+++ b/clients/client-iotanalytics/src/pagination/ListDatasetContentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDatasetContents(
       throw new Error("Invalid client, expected IoTAnalytics | IoTAnalyticsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotanalytics/src/pagination/ListDatasetsPaginator.ts b/clients/client-iotanalytics/src/pagination/ListDatasetsPaginator.ts
index b69c382b47e2..f1a0dfc91d31 100644
--- a/clients/client-iotanalytics/src/pagination/ListDatasetsPaginator.ts
+++ b/clients/client-iotanalytics/src/pagination/ListDatasetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDatasets(
       throw new Error("Invalid client, expected IoTAnalytics | IoTAnalyticsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotanalytics/src/pagination/ListDatastoresPaginator.ts b/clients/client-iotanalytics/src/pagination/ListDatastoresPaginator.ts
index eb6e19ccd1e7..4381291c3438 100644
--- a/clients/client-iotanalytics/src/pagination/ListDatastoresPaginator.ts
+++ b/clients/client-iotanalytics/src/pagination/ListDatastoresPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDatastores(
       throw new Error("Invalid client, expected IoTAnalytics | IoTAnalyticsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotanalytics/src/pagination/ListPipelinesPaginator.ts b/clients/client-iotanalytics/src/pagination/ListPipelinesPaginator.ts
index 1cd21bd090bd..0ccfb07e2a4a 100644
--- a/clients/client-iotanalytics/src/pagination/ListPipelinesPaginator.ts
+++ b/clients/client-iotanalytics/src/pagination/ListPipelinesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPipelines(
       throw new Error("Invalid client, expected IoTAnalytics | IoTAnalyticsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotdeviceadvisor/src/pagination/ListSuiteDefinitionsPaginator.ts b/clients/client-iotdeviceadvisor/src/pagination/ListSuiteDefinitionsPaginator.ts
index a3e8d8336bb3..50ee96efc3a4 100644
--- a/clients/client-iotdeviceadvisor/src/pagination/ListSuiteDefinitionsPaginator.ts
+++ b/clients/client-iotdeviceadvisor/src/pagination/ListSuiteDefinitionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSuiteDefinitions(
       throw new Error("Invalid client, expected IotDeviceAdvisor | IotDeviceAdvisorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotdeviceadvisor/src/pagination/ListSuiteRunsPaginator.ts b/clients/client-iotdeviceadvisor/src/pagination/ListSuiteRunsPaginator.ts
index 1f06effa7c0e..1647a395f05a 100644
--- a/clients/client-iotdeviceadvisor/src/pagination/ListSuiteRunsPaginator.ts
+++ b/clients/client-iotdeviceadvisor/src/pagination/ListSuiteRunsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSuiteRuns(
       throw new Error("Invalid client, expected IotDeviceAdvisor | IotDeviceAdvisorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotfleethub/src/pagination/ListApplicationsPaginator.ts b/clients/client-iotfleethub/src/pagination/ListApplicationsPaginator.ts
index 3eea7ae53e06..0991319d6808 100644
--- a/clients/client-iotfleethub/src/pagination/ListApplicationsPaginator.ts
+++ b/clients/client-iotfleethub/src/pagination/ListApplicationsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListApplications(
       throw new Error("Invalid client, expected IoTFleetHub | IoTFleetHubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotsecuretunneling/src/pagination/ListTunnelsPaginator.ts b/clients/client-iotsecuretunneling/src/pagination/ListTunnelsPaginator.ts
index 505721fc40dc..5f17a80bcf49 100644
--- a/clients/client-iotsecuretunneling/src/pagination/ListTunnelsPaginator.ts
+++ b/clients/client-iotsecuretunneling/src/pagination/ListTunnelsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListTunnels(
       throw new Error("Invalid client, expected IoTSecureTunneling | IoTSecureTunnelingClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotsitewise/src/pagination/GetAssetPropertyAggregatesPaginator.ts b/clients/client-iotsitewise/src/pagination/GetAssetPropertyAggregatesPaginator.ts
index 1b62a8c002e7..8155fe7a0284 100644
--- a/clients/client-iotsitewise/src/pagination/GetAssetPropertyAggregatesPaginator.ts
+++ b/clients/client-iotsitewise/src/pagination/GetAssetPropertyAggregatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetAssetPropertyAggregates(
       throw new Error("Invalid client, expected IoTSiteWise | IoTSiteWiseClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotsitewise/src/pagination/GetAssetPropertyValueHistoryPaginator.ts b/clients/client-iotsitewise/src/pagination/GetAssetPropertyValueHistoryPaginator.ts
index a6149326c3bf..b1b07798c9d8 100644
--- a/clients/client-iotsitewise/src/pagination/GetAssetPropertyValueHistoryPaginator.ts
+++ b/clients/client-iotsitewise/src/pagination/GetAssetPropertyValueHistoryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetAssetPropertyValueHistory(
       throw new Error("Invalid client, expected IoTSiteWise | IoTSiteWiseClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotsitewise/src/pagination/GetInterpolatedAssetPropertyValuesPaginator.ts b/clients/client-iotsitewise/src/pagination/GetInterpolatedAssetPropertyValuesPaginator.ts
index 62fed78b7d57..141088871322 100644
--- a/clients/client-iotsitewise/src/pagination/GetInterpolatedAssetPropertyValuesPaginator.ts
+++ b/clients/client-iotsitewise/src/pagination/GetInterpolatedAssetPropertyValuesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetInterpolatedAssetPropertyValues(
       throw new Error("Invalid client, expected IoTSiteWise | IoTSiteWiseClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotsitewise/src/pagination/ListAccessPoliciesPaginator.ts b/clients/client-iotsitewise/src/pagination/ListAccessPoliciesPaginator.ts
index 5f2e123b2785..228055ce0cb0 100644
--- a/clients/client-iotsitewise/src/pagination/ListAccessPoliciesPaginator.ts
+++ b/clients/client-iotsitewise/src/pagination/ListAccessPoliciesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAccessPolicies(
       throw new Error("Invalid client, expected IoTSiteWise | IoTSiteWiseClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotsitewise/src/pagination/ListAssetModelsPaginator.ts b/clients/client-iotsitewise/src/pagination/ListAssetModelsPaginator.ts
index 699bafba8f1f..5bebceaea364 100644
--- a/clients/client-iotsitewise/src/pagination/ListAssetModelsPaginator.ts
+++ b/clients/client-iotsitewise/src/pagination/ListAssetModelsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAssetModels(
       throw new Error("Invalid client, expected IoTSiteWise | IoTSiteWiseClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotsitewise/src/pagination/ListAssetRelationshipsPaginator.ts b/clients/client-iotsitewise/src/pagination/ListAssetRelationshipsPaginator.ts
index 4d6cc080c702..5b1c04959aa7 100644
--- a/clients/client-iotsitewise/src/pagination/ListAssetRelationshipsPaginator.ts
+++ b/clients/client-iotsitewise/src/pagination/ListAssetRelationshipsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAssetRelationships(
       throw new Error("Invalid client, expected IoTSiteWise | IoTSiteWiseClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotsitewise/src/pagination/ListAssetsPaginator.ts b/clients/client-iotsitewise/src/pagination/ListAssetsPaginator.ts
index 1d2a45d3cde9..e0be7404f614 100644
--- a/clients/client-iotsitewise/src/pagination/ListAssetsPaginator.ts
+++ b/clients/client-iotsitewise/src/pagination/ListAssetsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListAssets(
       throw new Error("Invalid client, expected IoTSiteWise | IoTSiteWiseClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotsitewise/src/pagination/ListAssociatedAssetsPaginator.ts b/clients/client-iotsitewise/src/pagination/ListAssociatedAssetsPaginator.ts
index 8f98f54a52d3..85c2cca52eca 100644
--- a/clients/client-iotsitewise/src/pagination/ListAssociatedAssetsPaginator.ts
+++ b/clients/client-iotsitewise/src/pagination/ListAssociatedAssetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAssociatedAssets(
       throw new Error("Invalid client, expected IoTSiteWise | IoTSiteWiseClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotsitewise/src/pagination/ListDashboardsPaginator.ts b/clients/client-iotsitewise/src/pagination/ListDashboardsPaginator.ts
index 927720226743..2043efe85c2f 100644
--- a/clients/client-iotsitewise/src/pagination/ListDashboardsPaginator.ts
+++ b/clients/client-iotsitewise/src/pagination/ListDashboardsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDashboards(
       throw new Error("Invalid client, expected IoTSiteWise | IoTSiteWiseClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotsitewise/src/pagination/ListGatewaysPaginator.ts b/clients/client-iotsitewise/src/pagination/ListGatewaysPaginator.ts
index 31ae5d1ebf1c..7e35c13f672f 100644
--- a/clients/client-iotsitewise/src/pagination/ListGatewaysPaginator.ts
+++ b/clients/client-iotsitewise/src/pagination/ListGatewaysPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListGateways(
       throw new Error("Invalid client, expected IoTSiteWise | IoTSiteWiseClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotsitewise/src/pagination/ListPortalsPaginator.ts b/clients/client-iotsitewise/src/pagination/ListPortalsPaginator.ts
index b952d9861aaa..2456d79213ab 100644
--- a/clients/client-iotsitewise/src/pagination/ListPortalsPaginator.ts
+++ b/clients/client-iotsitewise/src/pagination/ListPortalsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListPortals(
       throw new Error("Invalid client, expected IoTSiteWise | IoTSiteWiseClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotsitewise/src/pagination/ListProjectAssetsPaginator.ts b/clients/client-iotsitewise/src/pagination/ListProjectAssetsPaginator.ts
index 76f46e2e2499..fa9514fb344a 100644
--- a/clients/client-iotsitewise/src/pagination/ListProjectAssetsPaginator.ts
+++ b/clients/client-iotsitewise/src/pagination/ListProjectAssetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListProjectAssets(
       throw new Error("Invalid client, expected IoTSiteWise | IoTSiteWiseClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotsitewise/src/pagination/ListProjectsPaginator.ts b/clients/client-iotsitewise/src/pagination/ListProjectsPaginator.ts
index 64ecf12a4e49..6d5cfda82edb 100644
--- a/clients/client-iotsitewise/src/pagination/ListProjectsPaginator.ts
+++ b/clients/client-iotsitewise/src/pagination/ListProjectsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListProjects(
       throw new Error("Invalid client, expected IoTSiteWise | IoTSiteWiseClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotsitewise/src/pagination/ListTimeSeriesPaginator.ts b/clients/client-iotsitewise/src/pagination/ListTimeSeriesPaginator.ts
index ef6a2700ac00..5652b471c779 100644
--- a/clients/client-iotsitewise/src/pagination/ListTimeSeriesPaginator.ts
+++ b/clients/client-iotsitewise/src/pagination/ListTimeSeriesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTimeSeries(
       throw new Error("Invalid client, expected IoTSiteWise | IoTSiteWiseClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotthingsgraph/src/pagination/GetFlowTemplateRevisionsPaginator.ts b/clients/client-iotthingsgraph/src/pagination/GetFlowTemplateRevisionsPaginator.ts
index 4847a987d49b..54c195200f3f 100644
--- a/clients/client-iotthingsgraph/src/pagination/GetFlowTemplateRevisionsPaginator.ts
+++ b/clients/client-iotthingsgraph/src/pagination/GetFlowTemplateRevisionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetFlowTemplateRevisions(
       throw new Error("Invalid client, expected IoTThingsGraph | IoTThingsGraphClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotthingsgraph/src/pagination/GetSystemTemplateRevisionsPaginator.ts b/clients/client-iotthingsgraph/src/pagination/GetSystemTemplateRevisionsPaginator.ts
index 1edc766b8e51..af4c155a5d8a 100644
--- a/clients/client-iotthingsgraph/src/pagination/GetSystemTemplateRevisionsPaginator.ts
+++ b/clients/client-iotthingsgraph/src/pagination/GetSystemTemplateRevisionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetSystemTemplateRevisions(
       throw new Error("Invalid client, expected IoTThingsGraph | IoTThingsGraphClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotthingsgraph/src/pagination/ListFlowExecutionMessagesPaginator.ts b/clients/client-iotthingsgraph/src/pagination/ListFlowExecutionMessagesPaginator.ts
index b33baec8c0d7..ee4cbdafa257 100644
--- a/clients/client-iotthingsgraph/src/pagination/ListFlowExecutionMessagesPaginator.ts
+++ b/clients/client-iotthingsgraph/src/pagination/ListFlowExecutionMessagesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFlowExecutionMessages(
       throw new Error("Invalid client, expected IoTThingsGraph | IoTThingsGraphClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotthingsgraph/src/pagination/ListTagsForResourcePaginator.ts b/clients/client-iotthingsgraph/src/pagination/ListTagsForResourcePaginator.ts
index 967ffd563986..a344974c18f1 100644
--- a/clients/client-iotthingsgraph/src/pagination/ListTagsForResourcePaginator.ts
+++ b/clients/client-iotthingsgraph/src/pagination/ListTagsForResourcePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTagsForResource(
       throw new Error("Invalid client, expected IoTThingsGraph | IoTThingsGraphClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotthingsgraph/src/pagination/SearchEntitiesPaginator.ts b/clients/client-iotthingsgraph/src/pagination/SearchEntitiesPaginator.ts
index 1039b58837cb..830401f59e0b 100644
--- a/clients/client-iotthingsgraph/src/pagination/SearchEntitiesPaginator.ts
+++ b/clients/client-iotthingsgraph/src/pagination/SearchEntitiesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchEntities(
       throw new Error("Invalid client, expected IoTThingsGraph | IoTThingsGraphClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotthingsgraph/src/pagination/SearchFlowExecutionsPaginator.ts b/clients/client-iotthingsgraph/src/pagination/SearchFlowExecutionsPaginator.ts
index 528f2646544b..e40b1c54b5da 100644
--- a/clients/client-iotthingsgraph/src/pagination/SearchFlowExecutionsPaginator.ts
+++ b/clients/client-iotthingsgraph/src/pagination/SearchFlowExecutionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchFlowExecutions(
       throw new Error("Invalid client, expected IoTThingsGraph | IoTThingsGraphClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotthingsgraph/src/pagination/SearchFlowTemplatesPaginator.ts b/clients/client-iotthingsgraph/src/pagination/SearchFlowTemplatesPaginator.ts
index b0ce22fe1333..c08d17ee8c18 100644
--- a/clients/client-iotthingsgraph/src/pagination/SearchFlowTemplatesPaginator.ts
+++ b/clients/client-iotthingsgraph/src/pagination/SearchFlowTemplatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchFlowTemplates(
       throw new Error("Invalid client, expected IoTThingsGraph | IoTThingsGraphClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotthingsgraph/src/pagination/SearchSystemInstancesPaginator.ts b/clients/client-iotthingsgraph/src/pagination/SearchSystemInstancesPaginator.ts
index 2919e9300248..86368d479042 100644
--- a/clients/client-iotthingsgraph/src/pagination/SearchSystemInstancesPaginator.ts
+++ b/clients/client-iotthingsgraph/src/pagination/SearchSystemInstancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchSystemInstances(
       throw new Error("Invalid client, expected IoTThingsGraph | IoTThingsGraphClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotthingsgraph/src/pagination/SearchSystemTemplatesPaginator.ts b/clients/client-iotthingsgraph/src/pagination/SearchSystemTemplatesPaginator.ts
index b6c4c76bc3e4..888b1268fefc 100644
--- a/clients/client-iotthingsgraph/src/pagination/SearchSystemTemplatesPaginator.ts
+++ b/clients/client-iotthingsgraph/src/pagination/SearchSystemTemplatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchSystemTemplates(
       throw new Error("Invalid client, expected IoTThingsGraph | IoTThingsGraphClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotthingsgraph/src/pagination/SearchThingsPaginator.ts b/clients/client-iotthingsgraph/src/pagination/SearchThingsPaginator.ts
index f3cebf1e8c8a..8ec46141ba06 100644
--- a/clients/client-iotthingsgraph/src/pagination/SearchThingsPaginator.ts
+++ b/clients/client-iotthingsgraph/src/pagination/SearchThingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchThings(
       throw new Error("Invalid client, expected IoTThingsGraph | IoTThingsGraphClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iottwinmaker/src/pagination/GetPropertyValueHistoryPaginator.ts b/clients/client-iottwinmaker/src/pagination/GetPropertyValueHistoryPaginator.ts
index 71d1efb8b065..db08158967d8 100644
--- a/clients/client-iottwinmaker/src/pagination/GetPropertyValueHistoryPaginator.ts
+++ b/clients/client-iottwinmaker/src/pagination/GetPropertyValueHistoryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetPropertyValueHistory(
       throw new Error("Invalid client, expected IoTTwinMaker | IoTTwinMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iottwinmaker/src/pagination/ListComponentTypesPaginator.ts b/clients/client-iottwinmaker/src/pagination/ListComponentTypesPaginator.ts
index 0e3eefa16a8f..69e97a99e5de 100644
--- a/clients/client-iottwinmaker/src/pagination/ListComponentTypesPaginator.ts
+++ b/clients/client-iottwinmaker/src/pagination/ListComponentTypesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListComponentTypes(
       throw new Error("Invalid client, expected IoTTwinMaker | IoTTwinMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iottwinmaker/src/pagination/ListEntitiesPaginator.ts b/clients/client-iottwinmaker/src/pagination/ListEntitiesPaginator.ts
index 921dfe99f506..865dfcb1f7ab 100644
--- a/clients/client-iottwinmaker/src/pagination/ListEntitiesPaginator.ts
+++ b/clients/client-iottwinmaker/src/pagination/ListEntitiesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEntities(
       throw new Error("Invalid client, expected IoTTwinMaker | IoTTwinMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iottwinmaker/src/pagination/ListScenesPaginator.ts b/clients/client-iottwinmaker/src/pagination/ListScenesPaginator.ts
index 8353bcb71d10..70b977b5b638 100644
--- a/clients/client-iottwinmaker/src/pagination/ListScenesPaginator.ts
+++ b/clients/client-iottwinmaker/src/pagination/ListScenesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListScenes(
       throw new Error("Invalid client, expected IoTTwinMaker | IoTTwinMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iottwinmaker/src/pagination/ListWorkspacesPaginator.ts b/clients/client-iottwinmaker/src/pagination/ListWorkspacesPaginator.ts
index eb5860a49c1e..c8c9ef4bf95f 100644
--- a/clients/client-iottwinmaker/src/pagination/ListWorkspacesPaginator.ts
+++ b/clients/client-iottwinmaker/src/pagination/ListWorkspacesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListWorkspaces(
       throw new Error("Invalid client, expected IoTTwinMaker | IoTTwinMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ivs/src/pagination/ListChannelsPaginator.ts b/clients/client-ivs/src/pagination/ListChannelsPaginator.ts
index 2abe19dd4e53..b69a77548197 100644
--- a/clients/client-ivs/src/pagination/ListChannelsPaginator.ts
+++ b/clients/client-ivs/src/pagination/ListChannelsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListChannels(
       throw new Error("Invalid client, expected Ivs | IvsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ivs/src/pagination/ListPlaybackKeyPairsPaginator.ts b/clients/client-ivs/src/pagination/ListPlaybackKeyPairsPaginator.ts
index 7d84e3e9955b..671370ee9391 100644
--- a/clients/client-ivs/src/pagination/ListPlaybackKeyPairsPaginator.ts
+++ b/clients/client-ivs/src/pagination/ListPlaybackKeyPairsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPlaybackKeyPairs(
       throw new Error("Invalid client, expected Ivs | IvsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ivs/src/pagination/ListRecordingConfigurationsPaginator.ts b/clients/client-ivs/src/pagination/ListRecordingConfigurationsPaginator.ts
index c39d6478a67c..c7eb345dbc49 100644
--- a/clients/client-ivs/src/pagination/ListRecordingConfigurationsPaginator.ts
+++ b/clients/client-ivs/src/pagination/ListRecordingConfigurationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRecordingConfigurations(
       throw new Error("Invalid client, expected Ivs | IvsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ivs/src/pagination/ListStreamKeysPaginator.ts b/clients/client-ivs/src/pagination/ListStreamKeysPaginator.ts
index f311b68d6ffb..64cc6bd3e107 100644
--- a/clients/client-ivs/src/pagination/ListStreamKeysPaginator.ts
+++ b/clients/client-ivs/src/pagination/ListStreamKeysPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListStreamKeys(
       throw new Error("Invalid client, expected Ivs | IvsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ivs/src/pagination/ListStreamSessionsPaginator.ts b/clients/client-ivs/src/pagination/ListStreamSessionsPaginator.ts
index 93e449acec35..afd4e11ba2fd 100644
--- a/clients/client-ivs/src/pagination/ListStreamSessionsPaginator.ts
+++ b/clients/client-ivs/src/pagination/ListStreamSessionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListStreamSessions(
       throw new Error("Invalid client, expected Ivs | IvsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ivs/src/pagination/ListStreamsPaginator.ts b/clients/client-ivs/src/pagination/ListStreamsPaginator.ts
index 181fe97408cb..5ced91099d12 100644
--- a/clients/client-ivs/src/pagination/ListStreamsPaginator.ts
+++ b/clients/client-ivs/src/pagination/ListStreamsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListStreams(
       throw new Error("Invalid client, expected Ivs | IvsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-kafka/src/pagination/ListClusterOperationsPaginator.ts b/clients/client-kafka/src/pagination/ListClusterOperationsPaginator.ts
index 1e6e2476ed51..961df055f9a6 100644
--- a/clients/client-kafka/src/pagination/ListClusterOperationsPaginator.ts
+++ b/clients/client-kafka/src/pagination/ListClusterOperationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListClusterOperations(
       throw new Error("Invalid client, expected Kafka | KafkaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-kafka/src/pagination/ListClustersPaginator.ts b/clients/client-kafka/src/pagination/ListClustersPaginator.ts
index 0b07db0e7176..fe12a2923515 100644
--- a/clients/client-kafka/src/pagination/ListClustersPaginator.ts
+++ b/clients/client-kafka/src/pagination/ListClustersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListClusters(
       throw new Error("Invalid client, expected Kafka | KafkaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-kafka/src/pagination/ListClustersV2Paginator.ts b/clients/client-kafka/src/pagination/ListClustersV2Paginator.ts
index a7d3711b5d21..b06ebe93fd1e 100644
--- a/clients/client-kafka/src/pagination/ListClustersV2Paginator.ts
+++ b/clients/client-kafka/src/pagination/ListClustersV2Paginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListClustersV2(
       throw new Error("Invalid client, expected Kafka | KafkaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-kafka/src/pagination/ListConfigurationRevisionsPaginator.ts b/clients/client-kafka/src/pagination/ListConfigurationRevisionsPaginator.ts
index 0f2c31d3f094..1022dc5b08f8 100644
--- a/clients/client-kafka/src/pagination/ListConfigurationRevisionsPaginator.ts
+++ b/clients/client-kafka/src/pagination/ListConfigurationRevisionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListConfigurationRevisions(
       throw new Error("Invalid client, expected Kafka | KafkaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-kafka/src/pagination/ListConfigurationsPaginator.ts b/clients/client-kafka/src/pagination/ListConfigurationsPaginator.ts
index 5ea91289ff91..f99beda884f8 100644
--- a/clients/client-kafka/src/pagination/ListConfigurationsPaginator.ts
+++ b/clients/client-kafka/src/pagination/ListConfigurationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListConfigurations(
       throw new Error("Invalid client, expected Kafka | KafkaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-kafka/src/pagination/ListKafkaVersionsPaginator.ts b/clients/client-kafka/src/pagination/ListKafkaVersionsPaginator.ts
index 28de5143b05f..9ef3c166e376 100644
--- a/clients/client-kafka/src/pagination/ListKafkaVersionsPaginator.ts
+++ b/clients/client-kafka/src/pagination/ListKafkaVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListKafkaVersions(
       throw new Error("Invalid client, expected Kafka | KafkaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-kafka/src/pagination/ListNodesPaginator.ts b/clients/client-kafka/src/pagination/ListNodesPaginator.ts
index 9471899b0ebd..d7c75c347061 100644
--- a/clients/client-kafka/src/pagination/ListNodesPaginator.ts
+++ b/clients/client-kafka/src/pagination/ListNodesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListNodes(
       throw new Error("Invalid client, expected Kafka | KafkaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-kafka/src/pagination/ListScramSecretsPaginator.ts b/clients/client-kafka/src/pagination/ListScramSecretsPaginator.ts
index a6b27a244a2c..e0eba37590d7 100644
--- a/clients/client-kafka/src/pagination/ListScramSecretsPaginator.ts
+++ b/clients/client-kafka/src/pagination/ListScramSecretsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListScramSecrets(
       throw new Error("Invalid client, expected Kafka | KafkaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-kafkaconnect/src/pagination/ListConnectorsPaginator.ts b/clients/client-kafkaconnect/src/pagination/ListConnectorsPaginator.ts
index 686700c6553d..aaddcfb9eb89 100644
--- a/clients/client-kafkaconnect/src/pagination/ListConnectorsPaginator.ts
+++ b/clients/client-kafkaconnect/src/pagination/ListConnectorsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListConnectors(
       throw new Error("Invalid client, expected KafkaConnect | KafkaConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-kafkaconnect/src/pagination/ListCustomPluginsPaginator.ts b/clients/client-kafkaconnect/src/pagination/ListCustomPluginsPaginator.ts
index 8c994afc55ea..00f6537520a6 100644
--- a/clients/client-kafkaconnect/src/pagination/ListCustomPluginsPaginator.ts
+++ b/clients/client-kafkaconnect/src/pagination/ListCustomPluginsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCustomPlugins(
       throw new Error("Invalid client, expected KafkaConnect | KafkaConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-kafkaconnect/src/pagination/ListWorkerConfigurationsPaginator.ts b/clients/client-kafkaconnect/src/pagination/ListWorkerConfigurationsPaginator.ts
index 39abeb1a08f8..ec64bd228f7f 100644
--- a/clients/client-kafkaconnect/src/pagination/ListWorkerConfigurationsPaginator.ts
+++ b/clients/client-kafkaconnect/src/pagination/ListWorkerConfigurationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListWorkerConfigurations(
       throw new Error("Invalid client, expected KafkaConnect | KafkaConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-kendra/src/pagination/GetSnapshotsPaginator.ts b/clients/client-kendra/src/pagination/GetSnapshotsPaginator.ts
index dae03f2d1219..b3b4cf388a90 100644
--- a/clients/client-kendra/src/pagination/GetSnapshotsPaginator.ts
+++ b/clients/client-kendra/src/pagination/GetSnapshotsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetSnapshots(
       throw new Error("Invalid client, expected Kendra | KendraClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-kendra/src/pagination/ListDataSourceSyncJobsPaginator.ts b/clients/client-kendra/src/pagination/ListDataSourceSyncJobsPaginator.ts
index 5b9f03ed80b9..261e83651a35 100644
--- a/clients/client-kendra/src/pagination/ListDataSourceSyncJobsPaginator.ts
+++ b/clients/client-kendra/src/pagination/ListDataSourceSyncJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDataSourceSyncJobs(
       throw new Error("Invalid client, expected Kendra | KendraClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-kendra/src/pagination/ListDataSourcesPaginator.ts b/clients/client-kendra/src/pagination/ListDataSourcesPaginator.ts
index 674f81c6abef..115471bab511 100644
--- a/clients/client-kendra/src/pagination/ListDataSourcesPaginator.ts
+++ b/clients/client-kendra/src/pagination/ListDataSourcesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDataSources(
       throw new Error("Invalid client, expected Kendra | KendraClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-kendra/src/pagination/ListEntityPersonasPaginator.ts b/clients/client-kendra/src/pagination/ListEntityPersonasPaginator.ts
index 55b5846234a5..1f0ff59e4704 100644
--- a/clients/client-kendra/src/pagination/ListEntityPersonasPaginator.ts
+++ b/clients/client-kendra/src/pagination/ListEntityPersonasPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEntityPersonas(
       throw new Error("Invalid client, expected Kendra | KendraClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-kendra/src/pagination/ListExperienceEntitiesPaginator.ts b/clients/client-kendra/src/pagination/ListExperienceEntitiesPaginator.ts
index 6991b6501743..a30f7d083025 100644
--- a/clients/client-kendra/src/pagination/ListExperienceEntitiesPaginator.ts
+++ b/clients/client-kendra/src/pagination/ListExperienceEntitiesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListExperienceEntities(
       throw new Error("Invalid client, expected Kendra | KendraClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-kendra/src/pagination/ListExperiencesPaginator.ts b/clients/client-kendra/src/pagination/ListExperiencesPaginator.ts
index 6f38c86131ed..6a44956a5584 100644
--- a/clients/client-kendra/src/pagination/ListExperiencesPaginator.ts
+++ b/clients/client-kendra/src/pagination/ListExperiencesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListExperiences(
       throw new Error("Invalid client, expected Kendra | KendraClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-kendra/src/pagination/ListIndicesPaginator.ts b/clients/client-kendra/src/pagination/ListIndicesPaginator.ts
index d702959ae938..d27df6b93edb 100644
--- a/clients/client-kendra/src/pagination/ListIndicesPaginator.ts
+++ b/clients/client-kendra/src/pagination/ListIndicesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListIndices(
       throw new Error("Invalid client, expected Kendra | KendraClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-keyspaces/src/pagination/ListKeyspacesPaginator.ts b/clients/client-keyspaces/src/pagination/ListKeyspacesPaginator.ts
index 3b93acdcad05..5c48e929aae2 100644
--- a/clients/client-keyspaces/src/pagination/ListKeyspacesPaginator.ts
+++ b/clients/client-keyspaces/src/pagination/ListKeyspacesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListKeyspaces(
       throw new Error("Invalid client, expected Keyspaces | KeyspacesClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-keyspaces/src/pagination/ListTablesPaginator.ts b/clients/client-keyspaces/src/pagination/ListTablesPaginator.ts
index 3977f487963c..e87a72d9ee7f 100644
--- a/clients/client-keyspaces/src/pagination/ListTablesPaginator.ts
+++ b/clients/client-keyspaces/src/pagination/ListTablesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListTables(
       throw new Error("Invalid client, expected Keyspaces | KeyspacesClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-keyspaces/src/pagination/ListTagsForResourcePaginator.ts b/clients/client-keyspaces/src/pagination/ListTagsForResourcePaginator.ts
index b5062602d314..b724d554b698 100644
--- a/clients/client-keyspaces/src/pagination/ListTagsForResourcePaginator.ts
+++ b/clients/client-keyspaces/src/pagination/ListTagsForResourcePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTagsForResource(
       throw new Error("Invalid client, expected Keyspaces | KeyspacesClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-kinesis-video/src/pagination/ListSignalingChannelsPaginator.ts b/clients/client-kinesis-video/src/pagination/ListSignalingChannelsPaginator.ts
index 87914fb33bcd..3959e487c84b 100644
--- a/clients/client-kinesis-video/src/pagination/ListSignalingChannelsPaginator.ts
+++ b/clients/client-kinesis-video/src/pagination/ListSignalingChannelsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSignalingChannels(
       throw new Error("Invalid client, expected KinesisVideo | KinesisVideoClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-kinesis-video/src/pagination/ListStreamsPaginator.ts b/clients/client-kinesis-video/src/pagination/ListStreamsPaginator.ts
index 08a5fd149fcc..421dba9f69fd 100644
--- a/clients/client-kinesis-video/src/pagination/ListStreamsPaginator.ts
+++ b/clients/client-kinesis-video/src/pagination/ListStreamsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListStreams(
       throw new Error("Invalid client, expected KinesisVideo | KinesisVideoClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-kinesis/src/pagination/ListStreamConsumersPaginator.ts b/clients/client-kinesis/src/pagination/ListStreamConsumersPaginator.ts
index ba93741659e1..970dc1035b28 100644
--- a/clients/client-kinesis/src/pagination/ListStreamConsumersPaginator.ts
+++ b/clients/client-kinesis/src/pagination/ListStreamConsumersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListStreamConsumers(
       throw new Error("Invalid client, expected Kinesis | KinesisClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-kms/src/pagination/ListAliasesPaginator.ts b/clients/client-kms/src/pagination/ListAliasesPaginator.ts
index bc0be1e81dc5..328e7536d149 100644
--- a/clients/client-kms/src/pagination/ListAliasesPaginator.ts
+++ b/clients/client-kms/src/pagination/ListAliasesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListAliases(
       throw new Error("Invalid client, expected KMS | KMSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-kms/src/pagination/ListGrantsPaginator.ts b/clients/client-kms/src/pagination/ListGrantsPaginator.ts
index 3e66e6960385..1c4e565e5f66 100644
--- a/clients/client-kms/src/pagination/ListGrantsPaginator.ts
+++ b/clients/client-kms/src/pagination/ListGrantsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListGrants(
       throw new Error("Invalid client, expected KMS | KMSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-kms/src/pagination/ListKeyPoliciesPaginator.ts b/clients/client-kms/src/pagination/ListKeyPoliciesPaginator.ts
index c03b59c3749c..f30c55218d5b 100644
--- a/clients/client-kms/src/pagination/ListKeyPoliciesPaginator.ts
+++ b/clients/client-kms/src/pagination/ListKeyPoliciesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListKeyPolicies(
       throw new Error("Invalid client, expected KMS | KMSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-kms/src/pagination/ListKeysPaginator.ts b/clients/client-kms/src/pagination/ListKeysPaginator.ts
index 326c18f2d55e..92885a9e127f 100644
--- a/clients/client-kms/src/pagination/ListKeysPaginator.ts
+++ b/clients/client-kms/src/pagination/ListKeysPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListKeys(
       throw new Error("Invalid client, expected KMS | KMSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lakeformation/src/pagination/GetEffectivePermissionsForPathPaginator.ts b/clients/client-lakeformation/src/pagination/GetEffectivePermissionsForPathPaginator.ts
index cf02d8275d55..266d19081e10 100644
--- a/clients/client-lakeformation/src/pagination/GetEffectivePermissionsForPathPaginator.ts
+++ b/clients/client-lakeformation/src/pagination/GetEffectivePermissionsForPathPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetEffectivePermissionsForPath(
       throw new Error("Invalid client, expected LakeFormation | LakeFormationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lakeformation/src/pagination/GetTableObjectsPaginator.ts b/clients/client-lakeformation/src/pagination/GetTableObjectsPaginator.ts
index d9b7e24e8636..75af8cdcf3b0 100644
--- a/clients/client-lakeformation/src/pagination/GetTableObjectsPaginator.ts
+++ b/clients/client-lakeformation/src/pagination/GetTableObjectsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetTableObjects(
       throw new Error("Invalid client, expected LakeFormation | LakeFormationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lakeformation/src/pagination/GetWorkUnitsPaginator.ts b/clients/client-lakeformation/src/pagination/GetWorkUnitsPaginator.ts
index 092e6de23326..927863b051b8 100644
--- a/clients/client-lakeformation/src/pagination/GetWorkUnitsPaginator.ts
+++ b/clients/client-lakeformation/src/pagination/GetWorkUnitsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetWorkUnits(
       throw new Error("Invalid client, expected LakeFormation | LakeFormationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lakeformation/src/pagination/ListDataCellsFilterPaginator.ts b/clients/client-lakeformation/src/pagination/ListDataCellsFilterPaginator.ts
index ea503954f3e8..8afbc893fe7a 100644
--- a/clients/client-lakeformation/src/pagination/ListDataCellsFilterPaginator.ts
+++ b/clients/client-lakeformation/src/pagination/ListDataCellsFilterPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDataCellsFilter(
       throw new Error("Invalid client, expected LakeFormation | LakeFormationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lakeformation/src/pagination/ListLFTagsPaginator.ts b/clients/client-lakeformation/src/pagination/ListLFTagsPaginator.ts
index f5e91c619243..47cb34c812ad 100644
--- a/clients/client-lakeformation/src/pagination/ListLFTagsPaginator.ts
+++ b/clients/client-lakeformation/src/pagination/ListLFTagsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListLFTags(
       throw new Error("Invalid client, expected LakeFormation | LakeFormationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lakeformation/src/pagination/ListPermissionsPaginator.ts b/clients/client-lakeformation/src/pagination/ListPermissionsPaginator.ts
index 67b86c01530f..1f0a0d4dc008 100644
--- a/clients/client-lakeformation/src/pagination/ListPermissionsPaginator.ts
+++ b/clients/client-lakeformation/src/pagination/ListPermissionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPermissions(
       throw new Error("Invalid client, expected LakeFormation | LakeFormationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lakeformation/src/pagination/ListResourcesPaginator.ts b/clients/client-lakeformation/src/pagination/ListResourcesPaginator.ts
index 892428b0fb3c..f0e6308dae9b 100644
--- a/clients/client-lakeformation/src/pagination/ListResourcesPaginator.ts
+++ b/clients/client-lakeformation/src/pagination/ListResourcesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListResources(
       throw new Error("Invalid client, expected LakeFormation | LakeFormationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lakeformation/src/pagination/ListTableStorageOptimizersPaginator.ts b/clients/client-lakeformation/src/pagination/ListTableStorageOptimizersPaginator.ts
index 20141043b990..0d7238efd8c2 100644
--- a/clients/client-lakeformation/src/pagination/ListTableStorageOptimizersPaginator.ts
+++ b/clients/client-lakeformation/src/pagination/ListTableStorageOptimizersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTableStorageOptimizers(
       throw new Error("Invalid client, expected LakeFormation | LakeFormationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lakeformation/src/pagination/ListTransactionsPaginator.ts b/clients/client-lakeformation/src/pagination/ListTransactionsPaginator.ts
index 4d82f1b69721..79b1a188c986 100644
--- a/clients/client-lakeformation/src/pagination/ListTransactionsPaginator.ts
+++ b/clients/client-lakeformation/src/pagination/ListTransactionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTransactions(
       throw new Error("Invalid client, expected LakeFormation | LakeFormationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lakeformation/src/pagination/SearchDatabasesByLFTagsPaginator.ts b/clients/client-lakeformation/src/pagination/SearchDatabasesByLFTagsPaginator.ts
index 1058c74956eb..536fa8828af8 100644
--- a/clients/client-lakeformation/src/pagination/SearchDatabasesByLFTagsPaginator.ts
+++ b/clients/client-lakeformation/src/pagination/SearchDatabasesByLFTagsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchDatabasesByLFTags(
       throw new Error("Invalid client, expected LakeFormation | LakeFormationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lakeformation/src/pagination/SearchTablesByLFTagsPaginator.ts b/clients/client-lakeformation/src/pagination/SearchTablesByLFTagsPaginator.ts
index fa559feb08b8..fde7b5383066 100644
--- a/clients/client-lakeformation/src/pagination/SearchTablesByLFTagsPaginator.ts
+++ b/clients/client-lakeformation/src/pagination/SearchTablesByLFTagsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchTablesByLFTags(
       throw new Error("Invalid client, expected LakeFormation | LakeFormationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lambda/src/pagination/ListAliasesPaginator.ts b/clients/client-lambda/src/pagination/ListAliasesPaginator.ts
index 0b11b006379c..6d019341a1f6 100644
--- a/clients/client-lambda/src/pagination/ListAliasesPaginator.ts
+++ b/clients/client-lambda/src/pagination/ListAliasesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListAliases(
       throw new Error("Invalid client, expected Lambda | LambdaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lambda/src/pagination/ListCodeSigningConfigsPaginator.ts b/clients/client-lambda/src/pagination/ListCodeSigningConfigsPaginator.ts
index 5320e6ed4280..1e9aecb42999 100644
--- a/clients/client-lambda/src/pagination/ListCodeSigningConfigsPaginator.ts
+++ b/clients/client-lambda/src/pagination/ListCodeSigningConfigsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCodeSigningConfigs(
       throw new Error("Invalid client, expected Lambda | LambdaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lambda/src/pagination/ListEventSourceMappingsPaginator.ts b/clients/client-lambda/src/pagination/ListEventSourceMappingsPaginator.ts
index 85e21a2f50b8..3a7e7a27bd53 100644
--- a/clients/client-lambda/src/pagination/ListEventSourceMappingsPaginator.ts
+++ b/clients/client-lambda/src/pagination/ListEventSourceMappingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEventSourceMappings(
       throw new Error("Invalid client, expected Lambda | LambdaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lambda/src/pagination/ListFunctionEventInvokeConfigsPaginator.ts b/clients/client-lambda/src/pagination/ListFunctionEventInvokeConfigsPaginator.ts
index 8a228ebbb785..1af18158cf2f 100644
--- a/clients/client-lambda/src/pagination/ListFunctionEventInvokeConfigsPaginator.ts
+++ b/clients/client-lambda/src/pagination/ListFunctionEventInvokeConfigsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFunctionEventInvokeConfigs(
       throw new Error("Invalid client, expected Lambda | LambdaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lambda/src/pagination/ListFunctionUrlConfigsPaginator.ts b/clients/client-lambda/src/pagination/ListFunctionUrlConfigsPaginator.ts
index 0a9a4b704d28..cf733c23273e 100644
--- a/clients/client-lambda/src/pagination/ListFunctionUrlConfigsPaginator.ts
+++ b/clients/client-lambda/src/pagination/ListFunctionUrlConfigsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFunctionUrlConfigs(
       throw new Error("Invalid client, expected Lambda | LambdaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lambda/src/pagination/ListFunctionsByCodeSigningConfigPaginator.ts b/clients/client-lambda/src/pagination/ListFunctionsByCodeSigningConfigPaginator.ts
index ed4f541058e0..da7c3f43497d 100644
--- a/clients/client-lambda/src/pagination/ListFunctionsByCodeSigningConfigPaginator.ts
+++ b/clients/client-lambda/src/pagination/ListFunctionsByCodeSigningConfigPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFunctionsByCodeSigningConfig(
       throw new Error("Invalid client, expected Lambda | LambdaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lambda/src/pagination/ListFunctionsPaginator.ts b/clients/client-lambda/src/pagination/ListFunctionsPaginator.ts
index 5185ba2bd3be..0fc0adfc0618 100644
--- a/clients/client-lambda/src/pagination/ListFunctionsPaginator.ts
+++ b/clients/client-lambda/src/pagination/ListFunctionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFunctions(
       throw new Error("Invalid client, expected Lambda | LambdaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lambda/src/pagination/ListLayerVersionsPaginator.ts b/clients/client-lambda/src/pagination/ListLayerVersionsPaginator.ts
index a4c8111d3479..e7c45f9202e2 100644
--- a/clients/client-lambda/src/pagination/ListLayerVersionsPaginator.ts
+++ b/clients/client-lambda/src/pagination/ListLayerVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListLayerVersions(
       throw new Error("Invalid client, expected Lambda | LambdaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lambda/src/pagination/ListLayersPaginator.ts b/clients/client-lambda/src/pagination/ListLayersPaginator.ts
index a38287155fd8..cf476583895b 100644
--- a/clients/client-lambda/src/pagination/ListLayersPaginator.ts
+++ b/clients/client-lambda/src/pagination/ListLayersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListLayers(
       throw new Error("Invalid client, expected Lambda | LambdaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lambda/src/pagination/ListProvisionedConcurrencyConfigsPaginator.ts b/clients/client-lambda/src/pagination/ListProvisionedConcurrencyConfigsPaginator.ts
index 524ce7d4f10e..706ff2f5d740 100644
--- a/clients/client-lambda/src/pagination/ListProvisionedConcurrencyConfigsPaginator.ts
+++ b/clients/client-lambda/src/pagination/ListProvisionedConcurrencyConfigsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListProvisionedConcurrencyConfigs(
       throw new Error("Invalid client, expected Lambda | LambdaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lambda/src/pagination/ListVersionsByFunctionPaginator.ts b/clients/client-lambda/src/pagination/ListVersionsByFunctionPaginator.ts
index 72a83ae9dc7d..e62fef41b2ff 100644
--- a/clients/client-lambda/src/pagination/ListVersionsByFunctionPaginator.ts
+++ b/clients/client-lambda/src/pagination/ListVersionsByFunctionPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListVersionsByFunction(
       throw new Error("Invalid client, expected Lambda | LambdaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lex-model-building-service/src/pagination/GetBotAliasesPaginator.ts b/clients/client-lex-model-building-service/src/pagination/GetBotAliasesPaginator.ts
index b23d9571aaa4..0b74d8aba9f9 100644
--- a/clients/client-lex-model-building-service/src/pagination/GetBotAliasesPaginator.ts
+++ b/clients/client-lex-model-building-service/src/pagination/GetBotAliasesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetBotAliases(
       throw new Error("Invalid client, expected LexModelBuildingService | LexModelBuildingServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lex-model-building-service/src/pagination/GetBotChannelAssociationsPaginator.ts b/clients/client-lex-model-building-service/src/pagination/GetBotChannelAssociationsPaginator.ts
index 05fdbbc76fdf..c74eecaad31b 100644
--- a/clients/client-lex-model-building-service/src/pagination/GetBotChannelAssociationsPaginator.ts
+++ b/clients/client-lex-model-building-service/src/pagination/GetBotChannelAssociationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetBotChannelAssociations(
       throw new Error("Invalid client, expected LexModelBuildingService | LexModelBuildingServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lex-model-building-service/src/pagination/GetBotVersionsPaginator.ts b/clients/client-lex-model-building-service/src/pagination/GetBotVersionsPaginator.ts
index 38c4adc8e8e8..f9025e9cdb97 100644
--- a/clients/client-lex-model-building-service/src/pagination/GetBotVersionsPaginator.ts
+++ b/clients/client-lex-model-building-service/src/pagination/GetBotVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetBotVersions(
       throw new Error("Invalid client, expected LexModelBuildingService | LexModelBuildingServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lex-model-building-service/src/pagination/GetBotsPaginator.ts b/clients/client-lex-model-building-service/src/pagination/GetBotsPaginator.ts
index 117a6909643d..f0bce09939eb 100644
--- a/clients/client-lex-model-building-service/src/pagination/GetBotsPaginator.ts
+++ b/clients/client-lex-model-building-service/src/pagination/GetBotsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateGetBots(
       throw new Error("Invalid client, expected LexModelBuildingService | LexModelBuildingServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lex-model-building-service/src/pagination/GetBuiltinIntentsPaginator.ts b/clients/client-lex-model-building-service/src/pagination/GetBuiltinIntentsPaginator.ts
index d63d706dfc7d..82cba9681c25 100644
--- a/clients/client-lex-model-building-service/src/pagination/GetBuiltinIntentsPaginator.ts
+++ b/clients/client-lex-model-building-service/src/pagination/GetBuiltinIntentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetBuiltinIntents(
       throw new Error("Invalid client, expected LexModelBuildingService | LexModelBuildingServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lex-model-building-service/src/pagination/GetBuiltinSlotTypesPaginator.ts b/clients/client-lex-model-building-service/src/pagination/GetBuiltinSlotTypesPaginator.ts
index bbd1d4901ca2..e1dac671f436 100644
--- a/clients/client-lex-model-building-service/src/pagination/GetBuiltinSlotTypesPaginator.ts
+++ b/clients/client-lex-model-building-service/src/pagination/GetBuiltinSlotTypesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetBuiltinSlotTypes(
       throw new Error("Invalid client, expected LexModelBuildingService | LexModelBuildingServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lex-model-building-service/src/pagination/GetIntentVersionsPaginator.ts b/clients/client-lex-model-building-service/src/pagination/GetIntentVersionsPaginator.ts
index 125a8509b4e6..902aabf85aa9 100644
--- a/clients/client-lex-model-building-service/src/pagination/GetIntentVersionsPaginator.ts
+++ b/clients/client-lex-model-building-service/src/pagination/GetIntentVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetIntentVersions(
       throw new Error("Invalid client, expected LexModelBuildingService | LexModelBuildingServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lex-model-building-service/src/pagination/GetIntentsPaginator.ts b/clients/client-lex-model-building-service/src/pagination/GetIntentsPaginator.ts
index 802dd891e641..8478452a0aff 100644
--- a/clients/client-lex-model-building-service/src/pagination/GetIntentsPaginator.ts
+++ b/clients/client-lex-model-building-service/src/pagination/GetIntentsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateGetIntents(
       throw new Error("Invalid client, expected LexModelBuildingService | LexModelBuildingServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lex-model-building-service/src/pagination/GetMigrationsPaginator.ts b/clients/client-lex-model-building-service/src/pagination/GetMigrationsPaginator.ts
index 6f31092690bf..64cf1a51b78d 100644
--- a/clients/client-lex-model-building-service/src/pagination/GetMigrationsPaginator.ts
+++ b/clients/client-lex-model-building-service/src/pagination/GetMigrationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetMigrations(
       throw new Error("Invalid client, expected LexModelBuildingService | LexModelBuildingServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lex-model-building-service/src/pagination/GetSlotTypeVersionsPaginator.ts b/clients/client-lex-model-building-service/src/pagination/GetSlotTypeVersionsPaginator.ts
index 7b196a44cdc5..3352685c978d 100644
--- a/clients/client-lex-model-building-service/src/pagination/GetSlotTypeVersionsPaginator.ts
+++ b/clients/client-lex-model-building-service/src/pagination/GetSlotTypeVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetSlotTypeVersions(
       throw new Error("Invalid client, expected LexModelBuildingService | LexModelBuildingServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lex-model-building-service/src/pagination/GetSlotTypesPaginator.ts b/clients/client-lex-model-building-service/src/pagination/GetSlotTypesPaginator.ts
index fa0a45dc395d..21a4c5eba005 100644
--- a/clients/client-lex-model-building-service/src/pagination/GetSlotTypesPaginator.ts
+++ b/clients/client-lex-model-building-service/src/pagination/GetSlotTypesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetSlotTypes(
       throw new Error("Invalid client, expected LexModelBuildingService | LexModelBuildingServiceClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lex-models-v2/src/pagination/ListAggregatedUtterancesPaginator.ts b/clients/client-lex-models-v2/src/pagination/ListAggregatedUtterancesPaginator.ts
index 6b0b50364c4f..bf8748628df4 100644
--- a/clients/client-lex-models-v2/src/pagination/ListAggregatedUtterancesPaginator.ts
+++ b/clients/client-lex-models-v2/src/pagination/ListAggregatedUtterancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAggregatedUtterances(
       throw new Error("Invalid client, expected LexModelsV2 | LexModelsV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lex-models-v2/src/pagination/ListBotAliasesPaginator.ts b/clients/client-lex-models-v2/src/pagination/ListBotAliasesPaginator.ts
index ab07b4fd841f..57b7a570ef46 100644
--- a/clients/client-lex-models-v2/src/pagination/ListBotAliasesPaginator.ts
+++ b/clients/client-lex-models-v2/src/pagination/ListBotAliasesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListBotAliases(
       throw new Error("Invalid client, expected LexModelsV2 | LexModelsV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lex-models-v2/src/pagination/ListBotLocalesPaginator.ts b/clients/client-lex-models-v2/src/pagination/ListBotLocalesPaginator.ts
index f6da5b8d0334..517740766a88 100644
--- a/clients/client-lex-models-v2/src/pagination/ListBotLocalesPaginator.ts
+++ b/clients/client-lex-models-v2/src/pagination/ListBotLocalesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListBotLocales(
       throw new Error("Invalid client, expected LexModelsV2 | LexModelsV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lex-models-v2/src/pagination/ListBotRecommendationsPaginator.ts b/clients/client-lex-models-v2/src/pagination/ListBotRecommendationsPaginator.ts
index d35ec907f0e5..eaf39c1c5802 100644
--- a/clients/client-lex-models-v2/src/pagination/ListBotRecommendationsPaginator.ts
+++ b/clients/client-lex-models-v2/src/pagination/ListBotRecommendationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListBotRecommendations(
       throw new Error("Invalid client, expected LexModelsV2 | LexModelsV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lex-models-v2/src/pagination/ListBotVersionsPaginator.ts b/clients/client-lex-models-v2/src/pagination/ListBotVersionsPaginator.ts
index 229a33819440..f31d4540fc7d 100644
--- a/clients/client-lex-models-v2/src/pagination/ListBotVersionsPaginator.ts
+++ b/clients/client-lex-models-v2/src/pagination/ListBotVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListBotVersions(
       throw new Error("Invalid client, expected LexModelsV2 | LexModelsV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lex-models-v2/src/pagination/ListBotsPaginator.ts b/clients/client-lex-models-v2/src/pagination/ListBotsPaginator.ts
index c4ce1d74d291..2b6dc3a815bb 100644
--- a/clients/client-lex-models-v2/src/pagination/ListBotsPaginator.ts
+++ b/clients/client-lex-models-v2/src/pagination/ListBotsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListBots(
       throw new Error("Invalid client, expected LexModelsV2 | LexModelsV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lex-models-v2/src/pagination/ListBuiltInIntentsPaginator.ts b/clients/client-lex-models-v2/src/pagination/ListBuiltInIntentsPaginator.ts
index b37b5e3f3a82..d0160a1bfb5f 100644
--- a/clients/client-lex-models-v2/src/pagination/ListBuiltInIntentsPaginator.ts
+++ b/clients/client-lex-models-v2/src/pagination/ListBuiltInIntentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListBuiltInIntents(
       throw new Error("Invalid client, expected LexModelsV2 | LexModelsV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lex-models-v2/src/pagination/ListBuiltInSlotTypesPaginator.ts b/clients/client-lex-models-v2/src/pagination/ListBuiltInSlotTypesPaginator.ts
index 6598f5d56a0f..2523214aeaa7 100644
--- a/clients/client-lex-models-v2/src/pagination/ListBuiltInSlotTypesPaginator.ts
+++ b/clients/client-lex-models-v2/src/pagination/ListBuiltInSlotTypesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListBuiltInSlotTypes(
       throw new Error("Invalid client, expected LexModelsV2 | LexModelsV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lex-models-v2/src/pagination/ListExportsPaginator.ts b/clients/client-lex-models-v2/src/pagination/ListExportsPaginator.ts
index 59f3029ea060..da204b76af2e 100644
--- a/clients/client-lex-models-v2/src/pagination/ListExportsPaginator.ts
+++ b/clients/client-lex-models-v2/src/pagination/ListExportsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListExports(
       throw new Error("Invalid client, expected LexModelsV2 | LexModelsV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lex-models-v2/src/pagination/ListImportsPaginator.ts b/clients/client-lex-models-v2/src/pagination/ListImportsPaginator.ts
index 73db7a8713be..964f4abc49d6 100644
--- a/clients/client-lex-models-v2/src/pagination/ListImportsPaginator.ts
+++ b/clients/client-lex-models-v2/src/pagination/ListImportsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListImports(
       throw new Error("Invalid client, expected LexModelsV2 | LexModelsV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lex-models-v2/src/pagination/ListIntentsPaginator.ts b/clients/client-lex-models-v2/src/pagination/ListIntentsPaginator.ts
index 065d1c24089c..4af2a4929d3a 100644
--- a/clients/client-lex-models-v2/src/pagination/ListIntentsPaginator.ts
+++ b/clients/client-lex-models-v2/src/pagination/ListIntentsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListIntents(
       throw new Error("Invalid client, expected LexModelsV2 | LexModelsV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lex-models-v2/src/pagination/ListRecommendedIntentsPaginator.ts b/clients/client-lex-models-v2/src/pagination/ListRecommendedIntentsPaginator.ts
index 1706e062a00d..1aba862de1ef 100644
--- a/clients/client-lex-models-v2/src/pagination/ListRecommendedIntentsPaginator.ts
+++ b/clients/client-lex-models-v2/src/pagination/ListRecommendedIntentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRecommendedIntents(
       throw new Error("Invalid client, expected LexModelsV2 | LexModelsV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lex-models-v2/src/pagination/ListSlotTypesPaginator.ts b/clients/client-lex-models-v2/src/pagination/ListSlotTypesPaginator.ts
index 5dd2134b9b73..11c20164ed28 100644
--- a/clients/client-lex-models-v2/src/pagination/ListSlotTypesPaginator.ts
+++ b/clients/client-lex-models-v2/src/pagination/ListSlotTypesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSlotTypes(
       throw new Error("Invalid client, expected LexModelsV2 | LexModelsV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lex-models-v2/src/pagination/ListSlotsPaginator.ts b/clients/client-lex-models-v2/src/pagination/ListSlotsPaginator.ts
index c1fd07ba0bcc..2c95872f2ad1 100644
--- a/clients/client-lex-models-v2/src/pagination/ListSlotsPaginator.ts
+++ b/clients/client-lex-models-v2/src/pagination/ListSlotsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListSlots(
       throw new Error("Invalid client, expected LexModelsV2 | LexModelsV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-location/src/pagination/GetDevicePositionHistoryPaginator.ts b/clients/client-location/src/pagination/GetDevicePositionHistoryPaginator.ts
index c462df18f808..5cc9d21f57d9 100644
--- a/clients/client-location/src/pagination/GetDevicePositionHistoryPaginator.ts
+++ b/clients/client-location/src/pagination/GetDevicePositionHistoryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetDevicePositionHistory(
       throw new Error("Invalid client, expected Location | LocationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-location/src/pagination/ListDevicePositionsPaginator.ts b/clients/client-location/src/pagination/ListDevicePositionsPaginator.ts
index 781f6d103a1b..fdde7fb08458 100644
--- a/clients/client-location/src/pagination/ListDevicePositionsPaginator.ts
+++ b/clients/client-location/src/pagination/ListDevicePositionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDevicePositions(
       throw new Error("Invalid client, expected Location | LocationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-location/src/pagination/ListGeofenceCollectionsPaginator.ts b/clients/client-location/src/pagination/ListGeofenceCollectionsPaginator.ts
index ec15d4b67d5b..098bfa21460f 100644
--- a/clients/client-location/src/pagination/ListGeofenceCollectionsPaginator.ts
+++ b/clients/client-location/src/pagination/ListGeofenceCollectionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListGeofenceCollections(
       throw new Error("Invalid client, expected Location | LocationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-location/src/pagination/ListGeofencesPaginator.ts b/clients/client-location/src/pagination/ListGeofencesPaginator.ts
index 3a52219f32bf..d6f27b91012c 100644
--- a/clients/client-location/src/pagination/ListGeofencesPaginator.ts
+++ b/clients/client-location/src/pagination/ListGeofencesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListGeofences(
       throw new Error("Invalid client, expected Location | LocationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-location/src/pagination/ListMapsPaginator.ts b/clients/client-location/src/pagination/ListMapsPaginator.ts
index 3bd4aad23eea..ac302adc9915 100644
--- a/clients/client-location/src/pagination/ListMapsPaginator.ts
+++ b/clients/client-location/src/pagination/ListMapsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListMaps(
       throw new Error("Invalid client, expected Location | LocationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-location/src/pagination/ListPlaceIndexesPaginator.ts b/clients/client-location/src/pagination/ListPlaceIndexesPaginator.ts
index 66a95cc2c1d6..e0bd1678c418 100644
--- a/clients/client-location/src/pagination/ListPlaceIndexesPaginator.ts
+++ b/clients/client-location/src/pagination/ListPlaceIndexesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPlaceIndexes(
       throw new Error("Invalid client, expected Location | LocationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-location/src/pagination/ListRouteCalculatorsPaginator.ts b/clients/client-location/src/pagination/ListRouteCalculatorsPaginator.ts
index 7d5d6d85c810..682c889e210d 100644
--- a/clients/client-location/src/pagination/ListRouteCalculatorsPaginator.ts
+++ b/clients/client-location/src/pagination/ListRouteCalculatorsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRouteCalculators(
       throw new Error("Invalid client, expected Location | LocationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-location/src/pagination/ListTrackerConsumersPaginator.ts b/clients/client-location/src/pagination/ListTrackerConsumersPaginator.ts
index b36393fdf620..3f4e126faa6e 100644
--- a/clients/client-location/src/pagination/ListTrackerConsumersPaginator.ts
+++ b/clients/client-location/src/pagination/ListTrackerConsumersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTrackerConsumers(
       throw new Error("Invalid client, expected Location | LocationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-location/src/pagination/ListTrackersPaginator.ts b/clients/client-location/src/pagination/ListTrackersPaginator.ts
index ed2879ce076c..93798476903f 100644
--- a/clients/client-location/src/pagination/ListTrackersPaginator.ts
+++ b/clients/client-location/src/pagination/ListTrackersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTrackers(
       throw new Error("Invalid client, expected Location | LocationClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lookoutequipment/src/pagination/ListDataIngestionJobsPaginator.ts b/clients/client-lookoutequipment/src/pagination/ListDataIngestionJobsPaginator.ts
index 38e4dad6e1fb..5c187fa2d0df 100644
--- a/clients/client-lookoutequipment/src/pagination/ListDataIngestionJobsPaginator.ts
+++ b/clients/client-lookoutequipment/src/pagination/ListDataIngestionJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDataIngestionJobs(
       throw new Error("Invalid client, expected LookoutEquipment | LookoutEquipmentClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lookoutequipment/src/pagination/ListDatasetsPaginator.ts b/clients/client-lookoutequipment/src/pagination/ListDatasetsPaginator.ts
index 384314b50d0c..13ac03002c67 100644
--- a/clients/client-lookoutequipment/src/pagination/ListDatasetsPaginator.ts
+++ b/clients/client-lookoutequipment/src/pagination/ListDatasetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDatasets(
       throw new Error("Invalid client, expected LookoutEquipment | LookoutEquipmentClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lookoutequipment/src/pagination/ListInferenceExecutionsPaginator.ts b/clients/client-lookoutequipment/src/pagination/ListInferenceExecutionsPaginator.ts
index a7b1b2a2f669..1d0642067cdf 100644
--- a/clients/client-lookoutequipment/src/pagination/ListInferenceExecutionsPaginator.ts
+++ b/clients/client-lookoutequipment/src/pagination/ListInferenceExecutionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListInferenceExecutions(
       throw new Error("Invalid client, expected LookoutEquipment | LookoutEquipmentClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lookoutequipment/src/pagination/ListInferenceSchedulersPaginator.ts b/clients/client-lookoutequipment/src/pagination/ListInferenceSchedulersPaginator.ts
index 5d4b58ec5379..287493c6b3e5 100644
--- a/clients/client-lookoutequipment/src/pagination/ListInferenceSchedulersPaginator.ts
+++ b/clients/client-lookoutequipment/src/pagination/ListInferenceSchedulersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListInferenceSchedulers(
       throw new Error("Invalid client, expected LookoutEquipment | LookoutEquipmentClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lookoutequipment/src/pagination/ListModelsPaginator.ts b/clients/client-lookoutequipment/src/pagination/ListModelsPaginator.ts
index 3ef4fb459025..9715860e98b1 100644
--- a/clients/client-lookoutequipment/src/pagination/ListModelsPaginator.ts
+++ b/clients/client-lookoutequipment/src/pagination/ListModelsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListModels(
       throw new Error("Invalid client, expected LookoutEquipment | LookoutEquipmentClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lookoutmetrics/src/pagination/DescribeAnomalyDetectionExecutionsPaginator.ts b/clients/client-lookoutmetrics/src/pagination/DescribeAnomalyDetectionExecutionsPaginator.ts
index 0dfbe63279e9..be3c07246757 100644
--- a/clients/client-lookoutmetrics/src/pagination/DescribeAnomalyDetectionExecutionsPaginator.ts
+++ b/clients/client-lookoutmetrics/src/pagination/DescribeAnomalyDetectionExecutionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeAnomalyDetectionExecutions(
       throw new Error("Invalid client, expected LookoutMetrics | LookoutMetricsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lookoutmetrics/src/pagination/GetFeedbackPaginator.ts b/clients/client-lookoutmetrics/src/pagination/GetFeedbackPaginator.ts
index bb8491c525f4..4ee9f921a814 100644
--- a/clients/client-lookoutmetrics/src/pagination/GetFeedbackPaginator.ts
+++ b/clients/client-lookoutmetrics/src/pagination/GetFeedbackPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateGetFeedback(
       throw new Error("Invalid client, expected LookoutMetrics | LookoutMetricsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lookoutmetrics/src/pagination/ListAlertsPaginator.ts b/clients/client-lookoutmetrics/src/pagination/ListAlertsPaginator.ts
index 5cf4c1df15c6..de9d454e8af2 100644
--- a/clients/client-lookoutmetrics/src/pagination/ListAlertsPaginator.ts
+++ b/clients/client-lookoutmetrics/src/pagination/ListAlertsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListAlerts(
       throw new Error("Invalid client, expected LookoutMetrics | LookoutMetricsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lookoutmetrics/src/pagination/ListAnomalyDetectorsPaginator.ts b/clients/client-lookoutmetrics/src/pagination/ListAnomalyDetectorsPaginator.ts
index 4e5644bc2161..850e1d42d8c3 100644
--- a/clients/client-lookoutmetrics/src/pagination/ListAnomalyDetectorsPaginator.ts
+++ b/clients/client-lookoutmetrics/src/pagination/ListAnomalyDetectorsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAnomalyDetectors(
       throw new Error("Invalid client, expected LookoutMetrics | LookoutMetricsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lookoutmetrics/src/pagination/ListAnomalyGroupRelatedMetricsPaginator.ts b/clients/client-lookoutmetrics/src/pagination/ListAnomalyGroupRelatedMetricsPaginator.ts
index f8a9cc3ef616..e34cac42016a 100644
--- a/clients/client-lookoutmetrics/src/pagination/ListAnomalyGroupRelatedMetricsPaginator.ts
+++ b/clients/client-lookoutmetrics/src/pagination/ListAnomalyGroupRelatedMetricsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAnomalyGroupRelatedMetrics(
       throw new Error("Invalid client, expected LookoutMetrics | LookoutMetricsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lookoutmetrics/src/pagination/ListAnomalyGroupSummariesPaginator.ts b/clients/client-lookoutmetrics/src/pagination/ListAnomalyGroupSummariesPaginator.ts
index 7e44ef985e9a..31acfb3e849e 100644
--- a/clients/client-lookoutmetrics/src/pagination/ListAnomalyGroupSummariesPaginator.ts
+++ b/clients/client-lookoutmetrics/src/pagination/ListAnomalyGroupSummariesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAnomalyGroupSummaries(
       throw new Error("Invalid client, expected LookoutMetrics | LookoutMetricsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lookoutmetrics/src/pagination/ListAnomalyGroupTimeSeriesPaginator.ts b/clients/client-lookoutmetrics/src/pagination/ListAnomalyGroupTimeSeriesPaginator.ts
index 93dde684f1f8..52555536bd05 100644
--- a/clients/client-lookoutmetrics/src/pagination/ListAnomalyGroupTimeSeriesPaginator.ts
+++ b/clients/client-lookoutmetrics/src/pagination/ListAnomalyGroupTimeSeriesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAnomalyGroupTimeSeries(
       throw new Error("Invalid client, expected LookoutMetrics | LookoutMetricsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lookoutmetrics/src/pagination/ListMetricSetsPaginator.ts b/clients/client-lookoutmetrics/src/pagination/ListMetricSetsPaginator.ts
index 07b7519a284e..aad1a982e6a8 100644
--- a/clients/client-lookoutmetrics/src/pagination/ListMetricSetsPaginator.ts
+++ b/clients/client-lookoutmetrics/src/pagination/ListMetricSetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListMetricSets(
       throw new Error("Invalid client, expected LookoutMetrics | LookoutMetricsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lookoutvision/src/pagination/ListDatasetEntriesPaginator.ts b/clients/client-lookoutvision/src/pagination/ListDatasetEntriesPaginator.ts
index 0b854a791fc9..2eb43f1da237 100644
--- a/clients/client-lookoutvision/src/pagination/ListDatasetEntriesPaginator.ts
+++ b/clients/client-lookoutvision/src/pagination/ListDatasetEntriesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDatasetEntries(
       throw new Error("Invalid client, expected LookoutVision | LookoutVisionClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lookoutvision/src/pagination/ListModelPackagingJobsPaginator.ts b/clients/client-lookoutvision/src/pagination/ListModelPackagingJobsPaginator.ts
index 9b27be1a8743..3acce8808c94 100644
--- a/clients/client-lookoutvision/src/pagination/ListModelPackagingJobsPaginator.ts
+++ b/clients/client-lookoutvision/src/pagination/ListModelPackagingJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListModelPackagingJobs(
       throw new Error("Invalid client, expected LookoutVision | LookoutVisionClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lookoutvision/src/pagination/ListModelsPaginator.ts b/clients/client-lookoutvision/src/pagination/ListModelsPaginator.ts
index 3f62a40f68c8..4eb2504873a1 100644
--- a/clients/client-lookoutvision/src/pagination/ListModelsPaginator.ts
+++ b/clients/client-lookoutvision/src/pagination/ListModelsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListModels(
       throw new Error("Invalid client, expected LookoutVision | LookoutVisionClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-lookoutvision/src/pagination/ListProjectsPaginator.ts b/clients/client-lookoutvision/src/pagination/ListProjectsPaginator.ts
index eca3bcd2f17d..5e0bd640abb6 100644
--- a/clients/client-lookoutvision/src/pagination/ListProjectsPaginator.ts
+++ b/clients/client-lookoutvision/src/pagination/ListProjectsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListProjects(
       throw new Error("Invalid client, expected LookoutVision | LookoutVisionClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-machine-learning/src/pagination/DescribeBatchPredictionsPaginator.ts b/clients/client-machine-learning/src/pagination/DescribeBatchPredictionsPaginator.ts
index e0b4f530c2f4..5a9ac42051fd 100644
--- a/clients/client-machine-learning/src/pagination/DescribeBatchPredictionsPaginator.ts
+++ b/clients/client-machine-learning/src/pagination/DescribeBatchPredictionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeBatchPredictions(
       throw new Error("Invalid client, expected MachineLearning | MachineLearningClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-machine-learning/src/pagination/DescribeDataSourcesPaginator.ts b/clients/client-machine-learning/src/pagination/DescribeDataSourcesPaginator.ts
index 6c9a52b0e7e0..a15d24d59f9e 100644
--- a/clients/client-machine-learning/src/pagination/DescribeDataSourcesPaginator.ts
+++ b/clients/client-machine-learning/src/pagination/DescribeDataSourcesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDataSources(
       throw new Error("Invalid client, expected MachineLearning | MachineLearningClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-machine-learning/src/pagination/DescribeEvaluationsPaginator.ts b/clients/client-machine-learning/src/pagination/DescribeEvaluationsPaginator.ts
index 3cc2c6516432..9c113d017570 100644
--- a/clients/client-machine-learning/src/pagination/DescribeEvaluationsPaginator.ts
+++ b/clients/client-machine-learning/src/pagination/DescribeEvaluationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEvaluations(
       throw new Error("Invalid client, expected MachineLearning | MachineLearningClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-machine-learning/src/pagination/DescribeMLModelsPaginator.ts b/clients/client-machine-learning/src/pagination/DescribeMLModelsPaginator.ts
index 83939f33bd88..838f45cd5c43 100644
--- a/clients/client-machine-learning/src/pagination/DescribeMLModelsPaginator.ts
+++ b/clients/client-machine-learning/src/pagination/DescribeMLModelsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeMLModels(
       throw new Error("Invalid client, expected MachineLearning | MachineLearningClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-macie/src/pagination/ListMemberAccountsPaginator.ts b/clients/client-macie/src/pagination/ListMemberAccountsPaginator.ts
index c4dbbcda31e4..b6ba17a1497a 100644
--- a/clients/client-macie/src/pagination/ListMemberAccountsPaginator.ts
+++ b/clients/client-macie/src/pagination/ListMemberAccountsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListMemberAccounts(
       throw new Error("Invalid client, expected Macie | MacieClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-macie/src/pagination/ListS3ResourcesPaginator.ts b/clients/client-macie/src/pagination/ListS3ResourcesPaginator.ts
index a33df352ea65..79dd9460bda8 100644
--- a/clients/client-macie/src/pagination/ListS3ResourcesPaginator.ts
+++ b/clients/client-macie/src/pagination/ListS3ResourcesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListS3Resources(
       throw new Error("Invalid client, expected Macie | MacieClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-macie2/src/pagination/DescribeBucketsPaginator.ts b/clients/client-macie2/src/pagination/DescribeBucketsPaginator.ts
index 9adcb388dca6..e573a7050d37 100644
--- a/clients/client-macie2/src/pagination/DescribeBucketsPaginator.ts
+++ b/clients/client-macie2/src/pagination/DescribeBucketsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeBuckets(
       throw new Error("Invalid client, expected Macie2 | Macie2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-macie2/src/pagination/GetUsageStatisticsPaginator.ts b/clients/client-macie2/src/pagination/GetUsageStatisticsPaginator.ts
index 7c4cdf744d8c..4c126f8c0d5e 100644
--- a/clients/client-macie2/src/pagination/GetUsageStatisticsPaginator.ts
+++ b/clients/client-macie2/src/pagination/GetUsageStatisticsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetUsageStatistics(
       throw new Error("Invalid client, expected Macie2 | Macie2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-macie2/src/pagination/ListClassificationJobsPaginator.ts b/clients/client-macie2/src/pagination/ListClassificationJobsPaginator.ts
index 16f243a3c9d4..846194abc908 100644
--- a/clients/client-macie2/src/pagination/ListClassificationJobsPaginator.ts
+++ b/clients/client-macie2/src/pagination/ListClassificationJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListClassificationJobs(
       throw new Error("Invalid client, expected Macie2 | Macie2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-macie2/src/pagination/ListCustomDataIdentifiersPaginator.ts b/clients/client-macie2/src/pagination/ListCustomDataIdentifiersPaginator.ts
index 3bf48c4b9213..bc6907c2c9d9 100644
--- a/clients/client-macie2/src/pagination/ListCustomDataIdentifiersPaginator.ts
+++ b/clients/client-macie2/src/pagination/ListCustomDataIdentifiersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCustomDataIdentifiers(
       throw new Error("Invalid client, expected Macie2 | Macie2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-macie2/src/pagination/ListFindingsFiltersPaginator.ts b/clients/client-macie2/src/pagination/ListFindingsFiltersPaginator.ts
index 48cf7c48b5bc..e8ed9d0be1fe 100644
--- a/clients/client-macie2/src/pagination/ListFindingsFiltersPaginator.ts
+++ b/clients/client-macie2/src/pagination/ListFindingsFiltersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFindingsFilters(
       throw new Error("Invalid client, expected Macie2 | Macie2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-macie2/src/pagination/ListFindingsPaginator.ts b/clients/client-macie2/src/pagination/ListFindingsPaginator.ts
index b4bb8f5b9c9b..502bc9d8a24d 100644
--- a/clients/client-macie2/src/pagination/ListFindingsPaginator.ts
+++ b/clients/client-macie2/src/pagination/ListFindingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFindings(
       throw new Error("Invalid client, expected Macie2 | Macie2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-macie2/src/pagination/ListInvitationsPaginator.ts b/clients/client-macie2/src/pagination/ListInvitationsPaginator.ts
index 5b29803f29d8..da70728205b4 100644
--- a/clients/client-macie2/src/pagination/ListInvitationsPaginator.ts
+++ b/clients/client-macie2/src/pagination/ListInvitationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListInvitations(
       throw new Error("Invalid client, expected Macie2 | Macie2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-macie2/src/pagination/ListMembersPaginator.ts b/clients/client-macie2/src/pagination/ListMembersPaginator.ts
index 80af330f211b..bb3a0cba84df 100644
--- a/clients/client-macie2/src/pagination/ListMembersPaginator.ts
+++ b/clients/client-macie2/src/pagination/ListMembersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListMembers(
       throw new Error("Invalid client, expected Macie2 | Macie2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-macie2/src/pagination/ListOrganizationAdminAccountsPaginator.ts b/clients/client-macie2/src/pagination/ListOrganizationAdminAccountsPaginator.ts
index 1d60f254120f..7adc9be83d82 100644
--- a/clients/client-macie2/src/pagination/ListOrganizationAdminAccountsPaginator.ts
+++ b/clients/client-macie2/src/pagination/ListOrganizationAdminAccountsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListOrganizationAdminAccounts(
       throw new Error("Invalid client, expected Macie2 | Macie2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-macie2/src/pagination/SearchResourcesPaginator.ts b/clients/client-macie2/src/pagination/SearchResourcesPaginator.ts
index f0ddeb0be0ac..b360c483f83e 100644
--- a/clients/client-macie2/src/pagination/SearchResourcesPaginator.ts
+++ b/clients/client-macie2/src/pagination/SearchResourcesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchResources(
       throw new Error("Invalid client, expected Macie2 | Macie2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-managedblockchain/src/pagination/ListInvitationsPaginator.ts b/clients/client-managedblockchain/src/pagination/ListInvitationsPaginator.ts
index c804ca30429a..27d1654eb659 100644
--- a/clients/client-managedblockchain/src/pagination/ListInvitationsPaginator.ts
+++ b/clients/client-managedblockchain/src/pagination/ListInvitationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListInvitations(
       throw new Error("Invalid client, expected ManagedBlockchain | ManagedBlockchainClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-managedblockchain/src/pagination/ListMembersPaginator.ts b/clients/client-managedblockchain/src/pagination/ListMembersPaginator.ts
index c5a3ae23f749..baf0794eca38 100644
--- a/clients/client-managedblockchain/src/pagination/ListMembersPaginator.ts
+++ b/clients/client-managedblockchain/src/pagination/ListMembersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListMembers(
       throw new Error("Invalid client, expected ManagedBlockchain | ManagedBlockchainClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-managedblockchain/src/pagination/ListNetworksPaginator.ts b/clients/client-managedblockchain/src/pagination/ListNetworksPaginator.ts
index 63fd255b69c6..9e543f83e7a1 100644
--- a/clients/client-managedblockchain/src/pagination/ListNetworksPaginator.ts
+++ b/clients/client-managedblockchain/src/pagination/ListNetworksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListNetworks(
       throw new Error("Invalid client, expected ManagedBlockchain | ManagedBlockchainClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-managedblockchain/src/pagination/ListNodesPaginator.ts b/clients/client-managedblockchain/src/pagination/ListNodesPaginator.ts
index 46b0adeb2c1a..f0587a1e720f 100644
--- a/clients/client-managedblockchain/src/pagination/ListNodesPaginator.ts
+++ b/clients/client-managedblockchain/src/pagination/ListNodesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListNodes(
       throw new Error("Invalid client, expected ManagedBlockchain | ManagedBlockchainClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-managedblockchain/src/pagination/ListProposalVotesPaginator.ts b/clients/client-managedblockchain/src/pagination/ListProposalVotesPaginator.ts
index acd34cfb9cab..758b33dad636 100644
--- a/clients/client-managedblockchain/src/pagination/ListProposalVotesPaginator.ts
+++ b/clients/client-managedblockchain/src/pagination/ListProposalVotesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListProposalVotes(
       throw new Error("Invalid client, expected ManagedBlockchain | ManagedBlockchainClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-managedblockchain/src/pagination/ListProposalsPaginator.ts b/clients/client-managedblockchain/src/pagination/ListProposalsPaginator.ts
index 29c64a83d297..bd9577aa0779 100644
--- a/clients/client-managedblockchain/src/pagination/ListProposalsPaginator.ts
+++ b/clients/client-managedblockchain/src/pagination/ListProposalsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListProposals(
       throw new Error("Invalid client, expected ManagedBlockchain | ManagedBlockchainClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-marketplace-catalog/src/pagination/ListChangeSetsPaginator.ts b/clients/client-marketplace-catalog/src/pagination/ListChangeSetsPaginator.ts
index 77442306d8ea..0c895230a3b4 100644
--- a/clients/client-marketplace-catalog/src/pagination/ListChangeSetsPaginator.ts
+++ b/clients/client-marketplace-catalog/src/pagination/ListChangeSetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListChangeSets(
       throw new Error("Invalid client, expected MarketplaceCatalog | MarketplaceCatalogClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-marketplace-catalog/src/pagination/ListEntitiesPaginator.ts b/clients/client-marketplace-catalog/src/pagination/ListEntitiesPaginator.ts
index a3a991347ad8..1ad85edce55c 100644
--- a/clients/client-marketplace-catalog/src/pagination/ListEntitiesPaginator.ts
+++ b/clients/client-marketplace-catalog/src/pagination/ListEntitiesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEntities(
       throw new Error("Invalid client, expected MarketplaceCatalog | MarketplaceCatalogClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mediaconnect/src/pagination/ListEntitlementsPaginator.ts b/clients/client-mediaconnect/src/pagination/ListEntitlementsPaginator.ts
index beb0c504d616..b5f593a9485e 100644
--- a/clients/client-mediaconnect/src/pagination/ListEntitlementsPaginator.ts
+++ b/clients/client-mediaconnect/src/pagination/ListEntitlementsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEntitlements(
       throw new Error("Invalid client, expected MediaConnect | MediaConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mediaconnect/src/pagination/ListFlowsPaginator.ts b/clients/client-mediaconnect/src/pagination/ListFlowsPaginator.ts
index 776ddc3fcd70..0a2d85563b55 100644
--- a/clients/client-mediaconnect/src/pagination/ListFlowsPaginator.ts
+++ b/clients/client-mediaconnect/src/pagination/ListFlowsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListFlows(
       throw new Error("Invalid client, expected MediaConnect | MediaConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mediaconnect/src/pagination/ListOfferingsPaginator.ts b/clients/client-mediaconnect/src/pagination/ListOfferingsPaginator.ts
index 11bd1e2a40b7..b5fc6741309b 100644
--- a/clients/client-mediaconnect/src/pagination/ListOfferingsPaginator.ts
+++ b/clients/client-mediaconnect/src/pagination/ListOfferingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListOfferings(
       throw new Error("Invalid client, expected MediaConnect | MediaConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mediaconnect/src/pagination/ListReservationsPaginator.ts b/clients/client-mediaconnect/src/pagination/ListReservationsPaginator.ts
index 6eeaef0ea5fa..85427e53208b 100644
--- a/clients/client-mediaconnect/src/pagination/ListReservationsPaginator.ts
+++ b/clients/client-mediaconnect/src/pagination/ListReservationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListReservations(
       throw new Error("Invalid client, expected MediaConnect | MediaConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mediaconvert/src/pagination/DescribeEndpointsPaginator.ts b/clients/client-mediaconvert/src/pagination/DescribeEndpointsPaginator.ts
index cdf9d018fe78..b9c193756966 100644
--- a/clients/client-mediaconvert/src/pagination/DescribeEndpointsPaginator.ts
+++ b/clients/client-mediaconvert/src/pagination/DescribeEndpointsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEndpoints(
       throw new Error("Invalid client, expected MediaConvert | MediaConvertClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mediaconvert/src/pagination/ListJobTemplatesPaginator.ts b/clients/client-mediaconvert/src/pagination/ListJobTemplatesPaginator.ts
index c560c43bf754..88dea05ee740 100644
--- a/clients/client-mediaconvert/src/pagination/ListJobTemplatesPaginator.ts
+++ b/clients/client-mediaconvert/src/pagination/ListJobTemplatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListJobTemplates(
       throw new Error("Invalid client, expected MediaConvert | MediaConvertClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mediaconvert/src/pagination/ListJobsPaginator.ts b/clients/client-mediaconvert/src/pagination/ListJobsPaginator.ts
index 6cfc7624f5f5..0eebd95d4f70 100644
--- a/clients/client-mediaconvert/src/pagination/ListJobsPaginator.ts
+++ b/clients/client-mediaconvert/src/pagination/ListJobsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListJobs(
       throw new Error("Invalid client, expected MediaConvert | MediaConvertClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mediaconvert/src/pagination/ListPresetsPaginator.ts b/clients/client-mediaconvert/src/pagination/ListPresetsPaginator.ts
index 889c89faddc0..2839fe96e30e 100644
--- a/clients/client-mediaconvert/src/pagination/ListPresetsPaginator.ts
+++ b/clients/client-mediaconvert/src/pagination/ListPresetsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListPresets(
       throw new Error("Invalid client, expected MediaConvert | MediaConvertClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mediaconvert/src/pagination/ListQueuesPaginator.ts b/clients/client-mediaconvert/src/pagination/ListQueuesPaginator.ts
index 7ae95fe845c4..46a4b777c020 100644
--- a/clients/client-mediaconvert/src/pagination/ListQueuesPaginator.ts
+++ b/clients/client-mediaconvert/src/pagination/ListQueuesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListQueues(
       throw new Error("Invalid client, expected MediaConvert | MediaConvertClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-medialive/src/pagination/DescribeSchedulePaginator.ts b/clients/client-medialive/src/pagination/DescribeSchedulePaginator.ts
index 2a6bb4467a46..3e03877dee51 100644
--- a/clients/client-medialive/src/pagination/DescribeSchedulePaginator.ts
+++ b/clients/client-medialive/src/pagination/DescribeSchedulePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeSchedule(
       throw new Error("Invalid client, expected MediaLive | MediaLiveClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-medialive/src/pagination/ListChannelsPaginator.ts b/clients/client-medialive/src/pagination/ListChannelsPaginator.ts
index 05a986b2310f..b4bbe16405bb 100644
--- a/clients/client-medialive/src/pagination/ListChannelsPaginator.ts
+++ b/clients/client-medialive/src/pagination/ListChannelsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListChannels(
       throw new Error("Invalid client, expected MediaLive | MediaLiveClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-medialive/src/pagination/ListInputDeviceTransfersPaginator.ts b/clients/client-medialive/src/pagination/ListInputDeviceTransfersPaginator.ts
index 3abaec86f652..1522d7fb0d2c 100644
--- a/clients/client-medialive/src/pagination/ListInputDeviceTransfersPaginator.ts
+++ b/clients/client-medialive/src/pagination/ListInputDeviceTransfersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListInputDeviceTransfers(
       throw new Error("Invalid client, expected MediaLive | MediaLiveClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-medialive/src/pagination/ListInputDevicesPaginator.ts b/clients/client-medialive/src/pagination/ListInputDevicesPaginator.ts
index 2462ee50279e..3b639202b937 100644
--- a/clients/client-medialive/src/pagination/ListInputDevicesPaginator.ts
+++ b/clients/client-medialive/src/pagination/ListInputDevicesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListInputDevices(
       throw new Error("Invalid client, expected MediaLive | MediaLiveClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-medialive/src/pagination/ListInputSecurityGroupsPaginator.ts b/clients/client-medialive/src/pagination/ListInputSecurityGroupsPaginator.ts
index 3e7fe1413fec..a6682ded98cf 100644
--- a/clients/client-medialive/src/pagination/ListInputSecurityGroupsPaginator.ts
+++ b/clients/client-medialive/src/pagination/ListInputSecurityGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListInputSecurityGroups(
       throw new Error("Invalid client, expected MediaLive | MediaLiveClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-medialive/src/pagination/ListInputsPaginator.ts b/clients/client-medialive/src/pagination/ListInputsPaginator.ts
index 6eb8a91611b2..c8dde7b278cf 100644
--- a/clients/client-medialive/src/pagination/ListInputsPaginator.ts
+++ b/clients/client-medialive/src/pagination/ListInputsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListInputs(
       throw new Error("Invalid client, expected MediaLive | MediaLiveClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-medialive/src/pagination/ListMultiplexProgramsPaginator.ts b/clients/client-medialive/src/pagination/ListMultiplexProgramsPaginator.ts
index e3b33ee71a0f..dbd9ff45d99b 100644
--- a/clients/client-medialive/src/pagination/ListMultiplexProgramsPaginator.ts
+++ b/clients/client-medialive/src/pagination/ListMultiplexProgramsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListMultiplexPrograms(
       throw new Error("Invalid client, expected MediaLive | MediaLiveClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-medialive/src/pagination/ListMultiplexesPaginator.ts b/clients/client-medialive/src/pagination/ListMultiplexesPaginator.ts
index 2b45061c6f1d..02426ec4b262 100644
--- a/clients/client-medialive/src/pagination/ListMultiplexesPaginator.ts
+++ b/clients/client-medialive/src/pagination/ListMultiplexesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListMultiplexes(
       throw new Error("Invalid client, expected MediaLive | MediaLiveClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-medialive/src/pagination/ListOfferingsPaginator.ts b/clients/client-medialive/src/pagination/ListOfferingsPaginator.ts
index eb95d38353c3..01f82ba1cf35 100644
--- a/clients/client-medialive/src/pagination/ListOfferingsPaginator.ts
+++ b/clients/client-medialive/src/pagination/ListOfferingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListOfferings(
       throw new Error("Invalid client, expected MediaLive | MediaLiveClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-medialive/src/pagination/ListReservationsPaginator.ts b/clients/client-medialive/src/pagination/ListReservationsPaginator.ts
index 9909ae5c5872..ddf48912090e 100644
--- a/clients/client-medialive/src/pagination/ListReservationsPaginator.ts
+++ b/clients/client-medialive/src/pagination/ListReservationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListReservations(
       throw new Error("Invalid client, expected MediaLive | MediaLiveClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mediapackage-vod/src/pagination/ListAssetsPaginator.ts b/clients/client-mediapackage-vod/src/pagination/ListAssetsPaginator.ts
index 9fc129e06b53..aec20c7a8c40 100644
--- a/clients/client-mediapackage-vod/src/pagination/ListAssetsPaginator.ts
+++ b/clients/client-mediapackage-vod/src/pagination/ListAssetsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListAssets(
       throw new Error("Invalid client, expected MediaPackageVod | MediaPackageVodClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mediapackage-vod/src/pagination/ListPackagingConfigurationsPaginator.ts b/clients/client-mediapackage-vod/src/pagination/ListPackagingConfigurationsPaginator.ts
index d89fe51a7ffe..d0053a10c6e0 100644
--- a/clients/client-mediapackage-vod/src/pagination/ListPackagingConfigurationsPaginator.ts
+++ b/clients/client-mediapackage-vod/src/pagination/ListPackagingConfigurationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPackagingConfigurations(
       throw new Error("Invalid client, expected MediaPackageVod | MediaPackageVodClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mediapackage-vod/src/pagination/ListPackagingGroupsPaginator.ts b/clients/client-mediapackage-vod/src/pagination/ListPackagingGroupsPaginator.ts
index 54c95d29b21a..31aca99c9df3 100644
--- a/clients/client-mediapackage-vod/src/pagination/ListPackagingGroupsPaginator.ts
+++ b/clients/client-mediapackage-vod/src/pagination/ListPackagingGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPackagingGroups(
       throw new Error("Invalid client, expected MediaPackageVod | MediaPackageVodClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mediapackage/src/pagination/ListChannelsPaginator.ts b/clients/client-mediapackage/src/pagination/ListChannelsPaginator.ts
index 6788a1b8922b..cda1f77e6682 100644
--- a/clients/client-mediapackage/src/pagination/ListChannelsPaginator.ts
+++ b/clients/client-mediapackage/src/pagination/ListChannelsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListChannels(
       throw new Error("Invalid client, expected MediaPackage | MediaPackageClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mediapackage/src/pagination/ListHarvestJobsPaginator.ts b/clients/client-mediapackage/src/pagination/ListHarvestJobsPaginator.ts
index b9f0d1288e40..3b1bc65ec5bf 100644
--- a/clients/client-mediapackage/src/pagination/ListHarvestJobsPaginator.ts
+++ b/clients/client-mediapackage/src/pagination/ListHarvestJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListHarvestJobs(
       throw new Error("Invalid client, expected MediaPackage | MediaPackageClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mediapackage/src/pagination/ListOriginEndpointsPaginator.ts b/clients/client-mediapackage/src/pagination/ListOriginEndpointsPaginator.ts
index 036a614cecee..bd2fa75b3b3f 100644
--- a/clients/client-mediapackage/src/pagination/ListOriginEndpointsPaginator.ts
+++ b/clients/client-mediapackage/src/pagination/ListOriginEndpointsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListOriginEndpoints(
       throw new Error("Invalid client, expected MediaPackage | MediaPackageClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mediastore-data/src/pagination/ListItemsPaginator.ts b/clients/client-mediastore-data/src/pagination/ListItemsPaginator.ts
index 526eb86071c3..31c6945c9d25 100644
--- a/clients/client-mediastore-data/src/pagination/ListItemsPaginator.ts
+++ b/clients/client-mediastore-data/src/pagination/ListItemsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListItems(
       throw new Error("Invalid client, expected MediaStoreData | MediaStoreDataClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mediastore/src/pagination/ListContainersPaginator.ts b/clients/client-mediastore/src/pagination/ListContainersPaginator.ts
index 3fc3bfc26c02..6b48e2f81d93 100644
--- a/clients/client-mediastore/src/pagination/ListContainersPaginator.ts
+++ b/clients/client-mediastore/src/pagination/ListContainersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListContainers(
       throw new Error("Invalid client, expected MediaStore | MediaStoreClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mediatailor/src/pagination/GetChannelSchedulePaginator.ts b/clients/client-mediatailor/src/pagination/GetChannelSchedulePaginator.ts
index e7eb0e19eb9b..e4de227ee89e 100644
--- a/clients/client-mediatailor/src/pagination/GetChannelSchedulePaginator.ts
+++ b/clients/client-mediatailor/src/pagination/GetChannelSchedulePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetChannelSchedule(
       throw new Error("Invalid client, expected MediaTailor | MediaTailorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mediatailor/src/pagination/ListAlertsPaginator.ts b/clients/client-mediatailor/src/pagination/ListAlertsPaginator.ts
index 4efda80b46ab..2d5b72095642 100644
--- a/clients/client-mediatailor/src/pagination/ListAlertsPaginator.ts
+++ b/clients/client-mediatailor/src/pagination/ListAlertsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListAlerts(
       throw new Error("Invalid client, expected MediaTailor | MediaTailorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mediatailor/src/pagination/ListChannelsPaginator.ts b/clients/client-mediatailor/src/pagination/ListChannelsPaginator.ts
index d964c2d656b5..f7a39eadb55a 100644
--- a/clients/client-mediatailor/src/pagination/ListChannelsPaginator.ts
+++ b/clients/client-mediatailor/src/pagination/ListChannelsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListChannels(
       throw new Error("Invalid client, expected MediaTailor | MediaTailorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mediatailor/src/pagination/ListPlaybackConfigurationsPaginator.ts b/clients/client-mediatailor/src/pagination/ListPlaybackConfigurationsPaginator.ts
index 01a035249b3b..04aefbf1402d 100644
--- a/clients/client-mediatailor/src/pagination/ListPlaybackConfigurationsPaginator.ts
+++ b/clients/client-mediatailor/src/pagination/ListPlaybackConfigurationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPlaybackConfigurations(
       throw new Error("Invalid client, expected MediaTailor | MediaTailorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mediatailor/src/pagination/ListPrefetchSchedulesPaginator.ts b/clients/client-mediatailor/src/pagination/ListPrefetchSchedulesPaginator.ts
index a9407536ae9b..ec42893aeea9 100644
--- a/clients/client-mediatailor/src/pagination/ListPrefetchSchedulesPaginator.ts
+++ b/clients/client-mediatailor/src/pagination/ListPrefetchSchedulesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPrefetchSchedules(
       throw new Error("Invalid client, expected MediaTailor | MediaTailorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mediatailor/src/pagination/ListSourceLocationsPaginator.ts b/clients/client-mediatailor/src/pagination/ListSourceLocationsPaginator.ts
index ae135a35f049..f158999b5304 100644
--- a/clients/client-mediatailor/src/pagination/ListSourceLocationsPaginator.ts
+++ b/clients/client-mediatailor/src/pagination/ListSourceLocationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSourceLocations(
       throw new Error("Invalid client, expected MediaTailor | MediaTailorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mediatailor/src/pagination/ListVodSourcesPaginator.ts b/clients/client-mediatailor/src/pagination/ListVodSourcesPaginator.ts
index fd7db1b57afd..e1e01b58ef9f 100644
--- a/clients/client-mediatailor/src/pagination/ListVodSourcesPaginator.ts
+++ b/clients/client-mediatailor/src/pagination/ListVodSourcesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListVodSources(
       throw new Error("Invalid client, expected MediaTailor | MediaTailorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mgn/src/pagination/DescribeJobLogItemsPaginator.ts b/clients/client-mgn/src/pagination/DescribeJobLogItemsPaginator.ts
index b91a97150045..573b7d9468a7 100644
--- a/clients/client-mgn/src/pagination/DescribeJobLogItemsPaginator.ts
+++ b/clients/client-mgn/src/pagination/DescribeJobLogItemsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeJobLogItems(
       throw new Error("Invalid client, expected Mgn | MgnClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mgn/src/pagination/DescribeJobsPaginator.ts b/clients/client-mgn/src/pagination/DescribeJobsPaginator.ts
index 07598b9a480d..2df9af8f3920 100644
--- a/clients/client-mgn/src/pagination/DescribeJobsPaginator.ts
+++ b/clients/client-mgn/src/pagination/DescribeJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeJobs(
       throw new Error("Invalid client, expected Mgn | MgnClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mgn/src/pagination/DescribeReplicationConfigurationTemplatesPaginator.ts b/clients/client-mgn/src/pagination/DescribeReplicationConfigurationTemplatesPaginator.ts
index d417097f65f5..c95a66329d82 100644
--- a/clients/client-mgn/src/pagination/DescribeReplicationConfigurationTemplatesPaginator.ts
+++ b/clients/client-mgn/src/pagination/DescribeReplicationConfigurationTemplatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeReplicationConfigurationTemplates(
       throw new Error("Invalid client, expected Mgn | MgnClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mgn/src/pagination/DescribeSourceServersPaginator.ts b/clients/client-mgn/src/pagination/DescribeSourceServersPaginator.ts
index 32f93311ffbe..a41483a3a2e8 100644
--- a/clients/client-mgn/src/pagination/DescribeSourceServersPaginator.ts
+++ b/clients/client-mgn/src/pagination/DescribeSourceServersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeSourceServers(
       throw new Error("Invalid client, expected Mgn | MgnClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mgn/src/pagination/DescribeVcenterClientsPaginator.ts b/clients/client-mgn/src/pagination/DescribeVcenterClientsPaginator.ts
index 3cb9c3475624..01021d451bb4 100644
--- a/clients/client-mgn/src/pagination/DescribeVcenterClientsPaginator.ts
+++ b/clients/client-mgn/src/pagination/DescribeVcenterClientsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeVcenterClients(
       throw new Error("Invalid client, expected Mgn | MgnClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-migration-hub-refactor-spaces/src/pagination/ListApplicationsPaginator.ts b/clients/client-migration-hub-refactor-spaces/src/pagination/ListApplicationsPaginator.ts
index 58adbc3116a0..f44cbfe2bf3c 100644
--- a/clients/client-migration-hub-refactor-spaces/src/pagination/ListApplicationsPaginator.ts
+++ b/clients/client-migration-hub-refactor-spaces/src/pagination/ListApplicationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListApplications(
       throw new Error("Invalid client, expected MigrationHubRefactorSpaces | MigrationHubRefactorSpacesClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-migration-hub-refactor-spaces/src/pagination/ListEnvironmentVpcsPaginator.ts b/clients/client-migration-hub-refactor-spaces/src/pagination/ListEnvironmentVpcsPaginator.ts
index 193db4e00b0d..e071d1cefaab 100644
--- a/clients/client-migration-hub-refactor-spaces/src/pagination/ListEnvironmentVpcsPaginator.ts
+++ b/clients/client-migration-hub-refactor-spaces/src/pagination/ListEnvironmentVpcsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEnvironmentVpcs(
       throw new Error("Invalid client, expected MigrationHubRefactorSpaces | MigrationHubRefactorSpacesClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-migration-hub-refactor-spaces/src/pagination/ListEnvironmentsPaginator.ts b/clients/client-migration-hub-refactor-spaces/src/pagination/ListEnvironmentsPaginator.ts
index c10cb124ce87..01d98913369d 100644
--- a/clients/client-migration-hub-refactor-spaces/src/pagination/ListEnvironmentsPaginator.ts
+++ b/clients/client-migration-hub-refactor-spaces/src/pagination/ListEnvironmentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEnvironments(
       throw new Error("Invalid client, expected MigrationHubRefactorSpaces | MigrationHubRefactorSpacesClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-migration-hub-refactor-spaces/src/pagination/ListRoutesPaginator.ts b/clients/client-migration-hub-refactor-spaces/src/pagination/ListRoutesPaginator.ts
index 588b64283d71..2029240b7c00 100644
--- a/clients/client-migration-hub-refactor-spaces/src/pagination/ListRoutesPaginator.ts
+++ b/clients/client-migration-hub-refactor-spaces/src/pagination/ListRoutesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListRoutes(
       throw new Error("Invalid client, expected MigrationHubRefactorSpaces | MigrationHubRefactorSpacesClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-migration-hub-refactor-spaces/src/pagination/ListServicesPaginator.ts b/clients/client-migration-hub-refactor-spaces/src/pagination/ListServicesPaginator.ts
index a77d8b367bda..f4f74f2e0c32 100644
--- a/clients/client-migration-hub-refactor-spaces/src/pagination/ListServicesPaginator.ts
+++ b/clients/client-migration-hub-refactor-spaces/src/pagination/ListServicesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListServices(
       throw new Error("Invalid client, expected MigrationHubRefactorSpaces | MigrationHubRefactorSpacesClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-migration-hub/src/pagination/ListApplicationStatesPaginator.ts b/clients/client-migration-hub/src/pagination/ListApplicationStatesPaginator.ts
index 5eb234482b4b..5d738072c002 100644
--- a/clients/client-migration-hub/src/pagination/ListApplicationStatesPaginator.ts
+++ b/clients/client-migration-hub/src/pagination/ListApplicationStatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListApplicationStates(
       throw new Error("Invalid client, expected MigrationHub | MigrationHubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-migration-hub/src/pagination/ListCreatedArtifactsPaginator.ts b/clients/client-migration-hub/src/pagination/ListCreatedArtifactsPaginator.ts
index 3cc5ece2384f..469909f82f4c 100644
--- a/clients/client-migration-hub/src/pagination/ListCreatedArtifactsPaginator.ts
+++ b/clients/client-migration-hub/src/pagination/ListCreatedArtifactsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCreatedArtifacts(
       throw new Error("Invalid client, expected MigrationHub | MigrationHubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-migration-hub/src/pagination/ListDiscoveredResourcesPaginator.ts b/clients/client-migration-hub/src/pagination/ListDiscoveredResourcesPaginator.ts
index ecde275fec14..5aa7a476435d 100644
--- a/clients/client-migration-hub/src/pagination/ListDiscoveredResourcesPaginator.ts
+++ b/clients/client-migration-hub/src/pagination/ListDiscoveredResourcesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDiscoveredResources(
       throw new Error("Invalid client, expected MigrationHub | MigrationHubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-migration-hub/src/pagination/ListMigrationTasksPaginator.ts b/clients/client-migration-hub/src/pagination/ListMigrationTasksPaginator.ts
index ef3a5227977c..b75b3121f1ca 100644
--- a/clients/client-migration-hub/src/pagination/ListMigrationTasksPaginator.ts
+++ b/clients/client-migration-hub/src/pagination/ListMigrationTasksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListMigrationTasks(
       throw new Error("Invalid client, expected MigrationHub | MigrationHubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-migration-hub/src/pagination/ListProgressUpdateStreamsPaginator.ts b/clients/client-migration-hub/src/pagination/ListProgressUpdateStreamsPaginator.ts
index 96874e999171..7d80d7e984b6 100644
--- a/clients/client-migration-hub/src/pagination/ListProgressUpdateStreamsPaginator.ts
+++ b/clients/client-migration-hub/src/pagination/ListProgressUpdateStreamsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListProgressUpdateStreams(
       throw new Error("Invalid client, expected MigrationHub | MigrationHubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-migrationhub-config/src/pagination/DescribeHomeRegionControlsPaginator.ts b/clients/client-migrationhub-config/src/pagination/DescribeHomeRegionControlsPaginator.ts
index b6de45baf0a7..862be9c1132d 100644
--- a/clients/client-migrationhub-config/src/pagination/DescribeHomeRegionControlsPaginator.ts
+++ b/clients/client-migrationhub-config/src/pagination/DescribeHomeRegionControlsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeHomeRegionControls(
       throw new Error("Invalid client, expected MigrationHubConfig | MigrationHubConfigClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-migrationhubstrategy/src/pagination/GetServerDetailsPaginator.ts b/clients/client-migrationhubstrategy/src/pagination/GetServerDetailsPaginator.ts
index 5b11f655aa2b..706f9267f76e 100644
--- a/clients/client-migrationhubstrategy/src/pagination/GetServerDetailsPaginator.ts
+++ b/clients/client-migrationhubstrategy/src/pagination/GetServerDetailsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetServerDetails(
       throw new Error("Invalid client, expected MigrationHubStrategy | MigrationHubStrategyClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-migrationhubstrategy/src/pagination/ListApplicationComponentsPaginator.ts b/clients/client-migrationhubstrategy/src/pagination/ListApplicationComponentsPaginator.ts
index 99903f44d270..01638c01bd08 100644
--- a/clients/client-migrationhubstrategy/src/pagination/ListApplicationComponentsPaginator.ts
+++ b/clients/client-migrationhubstrategy/src/pagination/ListApplicationComponentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListApplicationComponents(
       throw new Error("Invalid client, expected MigrationHubStrategy | MigrationHubStrategyClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-migrationhubstrategy/src/pagination/ListCollectorsPaginator.ts b/clients/client-migrationhubstrategy/src/pagination/ListCollectorsPaginator.ts
index 7f189e3cbb4c..40df2bf2a07c 100644
--- a/clients/client-migrationhubstrategy/src/pagination/ListCollectorsPaginator.ts
+++ b/clients/client-migrationhubstrategy/src/pagination/ListCollectorsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCollectors(
       throw new Error("Invalid client, expected MigrationHubStrategy | MigrationHubStrategyClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-migrationhubstrategy/src/pagination/ListImportFileTaskPaginator.ts b/clients/client-migrationhubstrategy/src/pagination/ListImportFileTaskPaginator.ts
index b716ffb86b1e..7d7fbfee8488 100644
--- a/clients/client-migrationhubstrategy/src/pagination/ListImportFileTaskPaginator.ts
+++ b/clients/client-migrationhubstrategy/src/pagination/ListImportFileTaskPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListImportFileTask(
       throw new Error("Invalid client, expected MigrationHubStrategy | MigrationHubStrategyClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-migrationhubstrategy/src/pagination/ListServersPaginator.ts b/clients/client-migrationhubstrategy/src/pagination/ListServersPaginator.ts
index 38c3e073698c..be7530a4f31b 100644
--- a/clients/client-migrationhubstrategy/src/pagination/ListServersPaginator.ts
+++ b/clients/client-migrationhubstrategy/src/pagination/ListServersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListServers(
       throw new Error("Invalid client, expected MigrationHubStrategy | MigrationHubStrategyClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mobile/src/pagination/ListBundlesPaginator.ts b/clients/client-mobile/src/pagination/ListBundlesPaginator.ts
index ccea474cd468..c570ec4e5b56 100644
--- a/clients/client-mobile/src/pagination/ListBundlesPaginator.ts
+++ b/clients/client-mobile/src/pagination/ListBundlesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListBundles(
       throw new Error("Invalid client, expected Mobile | MobileClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mobile/src/pagination/ListProjectsPaginator.ts b/clients/client-mobile/src/pagination/ListProjectsPaginator.ts
index 68d2cd073075..95d04792d88d 100644
--- a/clients/client-mobile/src/pagination/ListProjectsPaginator.ts
+++ b/clients/client-mobile/src/pagination/ListProjectsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListProjects(
       throw new Error("Invalid client, expected Mobile | MobileClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mq/src/pagination/ListBrokersPaginator.ts b/clients/client-mq/src/pagination/ListBrokersPaginator.ts
index ffd5402099db..64625b86040f 100644
--- a/clients/client-mq/src/pagination/ListBrokersPaginator.ts
+++ b/clients/client-mq/src/pagination/ListBrokersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListBrokers(
       throw new Error("Invalid client, expected Mq | MqClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mturk/src/pagination/ListAssignmentsForHITPaginator.ts b/clients/client-mturk/src/pagination/ListAssignmentsForHITPaginator.ts
index 012988fbc232..7dca2fc5c735 100644
--- a/clients/client-mturk/src/pagination/ListAssignmentsForHITPaginator.ts
+++ b/clients/client-mturk/src/pagination/ListAssignmentsForHITPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAssignmentsForHIT(
       throw new Error("Invalid client, expected MTurk | MTurkClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mturk/src/pagination/ListBonusPaymentsPaginator.ts b/clients/client-mturk/src/pagination/ListBonusPaymentsPaginator.ts
index 4d1d75f90a15..63f9e829ff37 100644
--- a/clients/client-mturk/src/pagination/ListBonusPaymentsPaginator.ts
+++ b/clients/client-mturk/src/pagination/ListBonusPaymentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListBonusPayments(
       throw new Error("Invalid client, expected MTurk | MTurkClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mturk/src/pagination/ListHITsForQualificationTypePaginator.ts b/clients/client-mturk/src/pagination/ListHITsForQualificationTypePaginator.ts
index 5ed56d24be9e..b13b0f09c654 100644
--- a/clients/client-mturk/src/pagination/ListHITsForQualificationTypePaginator.ts
+++ b/clients/client-mturk/src/pagination/ListHITsForQualificationTypePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListHITsForQualificationType(
       throw new Error("Invalid client, expected MTurk | MTurkClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mturk/src/pagination/ListHITsPaginator.ts b/clients/client-mturk/src/pagination/ListHITsPaginator.ts
index d9422271a2b5..2d6f082130e6 100644
--- a/clients/client-mturk/src/pagination/ListHITsPaginator.ts
+++ b/clients/client-mturk/src/pagination/ListHITsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListHITs(
       throw new Error("Invalid client, expected MTurk | MTurkClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mturk/src/pagination/ListQualificationRequestsPaginator.ts b/clients/client-mturk/src/pagination/ListQualificationRequestsPaginator.ts
index 54b2fd2bd3b6..d4d993d47139 100644
--- a/clients/client-mturk/src/pagination/ListQualificationRequestsPaginator.ts
+++ b/clients/client-mturk/src/pagination/ListQualificationRequestsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListQualificationRequests(
       throw new Error("Invalid client, expected MTurk | MTurkClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mturk/src/pagination/ListQualificationTypesPaginator.ts b/clients/client-mturk/src/pagination/ListQualificationTypesPaginator.ts
index 45a094a2a83f..885f4cc8e635 100644
--- a/clients/client-mturk/src/pagination/ListQualificationTypesPaginator.ts
+++ b/clients/client-mturk/src/pagination/ListQualificationTypesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListQualificationTypes(
       throw new Error("Invalid client, expected MTurk | MTurkClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mturk/src/pagination/ListReviewPolicyResultsForHITPaginator.ts b/clients/client-mturk/src/pagination/ListReviewPolicyResultsForHITPaginator.ts
index 949706ca21eb..276c8e32ef95 100644
--- a/clients/client-mturk/src/pagination/ListReviewPolicyResultsForHITPaginator.ts
+++ b/clients/client-mturk/src/pagination/ListReviewPolicyResultsForHITPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListReviewPolicyResultsForHIT(
       throw new Error("Invalid client, expected MTurk | MTurkClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mturk/src/pagination/ListReviewableHITsPaginator.ts b/clients/client-mturk/src/pagination/ListReviewableHITsPaginator.ts
index 7013a87729ba..8cfe1b81665d 100644
--- a/clients/client-mturk/src/pagination/ListReviewableHITsPaginator.ts
+++ b/clients/client-mturk/src/pagination/ListReviewableHITsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListReviewableHITs(
       throw new Error("Invalid client, expected MTurk | MTurkClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mturk/src/pagination/ListWorkerBlocksPaginator.ts b/clients/client-mturk/src/pagination/ListWorkerBlocksPaginator.ts
index 582f7e2f81ad..4c95d94d5928 100644
--- a/clients/client-mturk/src/pagination/ListWorkerBlocksPaginator.ts
+++ b/clients/client-mturk/src/pagination/ListWorkerBlocksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListWorkerBlocks(
       throw new Error("Invalid client, expected MTurk | MTurkClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mturk/src/pagination/ListWorkersWithQualificationTypePaginator.ts b/clients/client-mturk/src/pagination/ListWorkersWithQualificationTypePaginator.ts
index e5ca93cfe11f..a61af71936c6 100644
--- a/clients/client-mturk/src/pagination/ListWorkersWithQualificationTypePaginator.ts
+++ b/clients/client-mturk/src/pagination/ListWorkersWithQualificationTypePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListWorkersWithQualificationType(
       throw new Error("Invalid client, expected MTurk | MTurkClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mwaa/src/pagination/ListEnvironmentsPaginator.ts b/clients/client-mwaa/src/pagination/ListEnvironmentsPaginator.ts
index 1a8b63dd9e18..e46c0d52cdfc 100644
--- a/clients/client-mwaa/src/pagination/ListEnvironmentsPaginator.ts
+++ b/clients/client-mwaa/src/pagination/ListEnvironmentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEnvironments(
       throw new Error("Invalid client, expected MWAA | MWAAClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-neptune/src/pagination/DescribeDBClusterEndpointsPaginator.ts b/clients/client-neptune/src/pagination/DescribeDBClusterEndpointsPaginator.ts
index dc66fe6df63a..952e6082d475 100644
--- a/clients/client-neptune/src/pagination/DescribeDBClusterEndpointsPaginator.ts
+++ b/clients/client-neptune/src/pagination/DescribeDBClusterEndpointsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBClusterEndpoints(
       throw new Error("Invalid client, expected Neptune | NeptuneClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-neptune/src/pagination/DescribeDBClusterParameterGroupsPaginator.ts b/clients/client-neptune/src/pagination/DescribeDBClusterParameterGroupsPaginator.ts
index e17bf7ff7e5a..5759bedbfdca 100644
--- a/clients/client-neptune/src/pagination/DescribeDBClusterParameterGroupsPaginator.ts
+++ b/clients/client-neptune/src/pagination/DescribeDBClusterParameterGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBClusterParameterGroups(
       throw new Error("Invalid client, expected Neptune | NeptuneClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-neptune/src/pagination/DescribeDBClusterParametersPaginator.ts b/clients/client-neptune/src/pagination/DescribeDBClusterParametersPaginator.ts
index d8d13ea2e7e8..078acad8fc5d 100644
--- a/clients/client-neptune/src/pagination/DescribeDBClusterParametersPaginator.ts
+++ b/clients/client-neptune/src/pagination/DescribeDBClusterParametersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBClusterParameters(
       throw new Error("Invalid client, expected Neptune | NeptuneClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-neptune/src/pagination/DescribeDBClusterSnapshotsPaginator.ts b/clients/client-neptune/src/pagination/DescribeDBClusterSnapshotsPaginator.ts
index 4bbe5f628306..7658feae441f 100644
--- a/clients/client-neptune/src/pagination/DescribeDBClusterSnapshotsPaginator.ts
+++ b/clients/client-neptune/src/pagination/DescribeDBClusterSnapshotsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBClusterSnapshots(
       throw new Error("Invalid client, expected Neptune | NeptuneClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-neptune/src/pagination/DescribeDBClustersPaginator.ts b/clients/client-neptune/src/pagination/DescribeDBClustersPaginator.ts
index 41b43719a13c..68efff671eb7 100644
--- a/clients/client-neptune/src/pagination/DescribeDBClustersPaginator.ts
+++ b/clients/client-neptune/src/pagination/DescribeDBClustersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBClusters(
       throw new Error("Invalid client, expected Neptune | NeptuneClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-neptune/src/pagination/DescribeDBEngineVersionsPaginator.ts b/clients/client-neptune/src/pagination/DescribeDBEngineVersionsPaginator.ts
index e1ba41ca2a89..3b8503611ba5 100644
--- a/clients/client-neptune/src/pagination/DescribeDBEngineVersionsPaginator.ts
+++ b/clients/client-neptune/src/pagination/DescribeDBEngineVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBEngineVersions(
       throw new Error("Invalid client, expected Neptune | NeptuneClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-neptune/src/pagination/DescribeDBInstancesPaginator.ts b/clients/client-neptune/src/pagination/DescribeDBInstancesPaginator.ts
index babe8625e1e4..ed4e68553e02 100644
--- a/clients/client-neptune/src/pagination/DescribeDBInstancesPaginator.ts
+++ b/clients/client-neptune/src/pagination/DescribeDBInstancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBInstances(
       throw new Error("Invalid client, expected Neptune | NeptuneClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-neptune/src/pagination/DescribeDBParameterGroupsPaginator.ts b/clients/client-neptune/src/pagination/DescribeDBParameterGroupsPaginator.ts
index 74ab2701f03c..e488ecd02cf4 100644
--- a/clients/client-neptune/src/pagination/DescribeDBParameterGroupsPaginator.ts
+++ b/clients/client-neptune/src/pagination/DescribeDBParameterGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBParameterGroups(
       throw new Error("Invalid client, expected Neptune | NeptuneClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-neptune/src/pagination/DescribeDBParametersPaginator.ts b/clients/client-neptune/src/pagination/DescribeDBParametersPaginator.ts
index 8edcabfbbac5..aec62b7d5872 100644
--- a/clients/client-neptune/src/pagination/DescribeDBParametersPaginator.ts
+++ b/clients/client-neptune/src/pagination/DescribeDBParametersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBParameters(
       throw new Error("Invalid client, expected Neptune | NeptuneClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-neptune/src/pagination/DescribeDBSubnetGroupsPaginator.ts b/clients/client-neptune/src/pagination/DescribeDBSubnetGroupsPaginator.ts
index ca002a41a6ad..5c41c84179b7 100644
--- a/clients/client-neptune/src/pagination/DescribeDBSubnetGroupsPaginator.ts
+++ b/clients/client-neptune/src/pagination/DescribeDBSubnetGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBSubnetGroups(
       throw new Error("Invalid client, expected Neptune | NeptuneClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-neptune/src/pagination/DescribeEngineDefaultParametersPaginator.ts b/clients/client-neptune/src/pagination/DescribeEngineDefaultParametersPaginator.ts
index 674e6a049147..c7d53d6721a9 100644
--- a/clients/client-neptune/src/pagination/DescribeEngineDefaultParametersPaginator.ts
+++ b/clients/client-neptune/src/pagination/DescribeEngineDefaultParametersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEngineDefaultParameters(
       throw new Error("Invalid client, expected Neptune | NeptuneClient");
     }
     yield page;
+    const prevToken = token;
     token = page.EngineDefaults!.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-neptune/src/pagination/DescribeEventSubscriptionsPaginator.ts b/clients/client-neptune/src/pagination/DescribeEventSubscriptionsPaginator.ts
index cc8f0c3b114a..96457926c368 100644
--- a/clients/client-neptune/src/pagination/DescribeEventSubscriptionsPaginator.ts
+++ b/clients/client-neptune/src/pagination/DescribeEventSubscriptionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEventSubscriptions(
       throw new Error("Invalid client, expected Neptune | NeptuneClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-neptune/src/pagination/DescribeEventsPaginator.ts b/clients/client-neptune/src/pagination/DescribeEventsPaginator.ts
index ae7b15ec2ecc..d0fdda446ff3 100644
--- a/clients/client-neptune/src/pagination/DescribeEventsPaginator.ts
+++ b/clients/client-neptune/src/pagination/DescribeEventsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEvents(
       throw new Error("Invalid client, expected Neptune | NeptuneClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-neptune/src/pagination/DescribeOrderableDBInstanceOptionsPaginator.ts b/clients/client-neptune/src/pagination/DescribeOrderableDBInstanceOptionsPaginator.ts
index 1e1c7996a04c..8ddf51e5c2e0 100644
--- a/clients/client-neptune/src/pagination/DescribeOrderableDBInstanceOptionsPaginator.ts
+++ b/clients/client-neptune/src/pagination/DescribeOrderableDBInstanceOptionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeOrderableDBInstanceOptions(
       throw new Error("Invalid client, expected Neptune | NeptuneClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-neptune/src/pagination/DescribePendingMaintenanceActionsPaginator.ts b/clients/client-neptune/src/pagination/DescribePendingMaintenanceActionsPaginator.ts
index a0d229e2f60c..b0d08dbc8ea8 100644
--- a/clients/client-neptune/src/pagination/DescribePendingMaintenanceActionsPaginator.ts
+++ b/clients/client-neptune/src/pagination/DescribePendingMaintenanceActionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribePendingMaintenanceActions(
       throw new Error("Invalid client, expected Neptune | NeptuneClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-network-firewall/src/pagination/ListFirewallPoliciesPaginator.ts b/clients/client-network-firewall/src/pagination/ListFirewallPoliciesPaginator.ts
index 21c391b8a951..e4856ba73903 100644
--- a/clients/client-network-firewall/src/pagination/ListFirewallPoliciesPaginator.ts
+++ b/clients/client-network-firewall/src/pagination/ListFirewallPoliciesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFirewallPolicies(
       throw new Error("Invalid client, expected NetworkFirewall | NetworkFirewallClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-network-firewall/src/pagination/ListFirewallsPaginator.ts b/clients/client-network-firewall/src/pagination/ListFirewallsPaginator.ts
index c4a21eb61822..c5835eda393e 100644
--- a/clients/client-network-firewall/src/pagination/ListFirewallsPaginator.ts
+++ b/clients/client-network-firewall/src/pagination/ListFirewallsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFirewalls(
       throw new Error("Invalid client, expected NetworkFirewall | NetworkFirewallClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-network-firewall/src/pagination/ListRuleGroupsPaginator.ts b/clients/client-network-firewall/src/pagination/ListRuleGroupsPaginator.ts
index 1ebaa4322826..59cbc86faf9a 100644
--- a/clients/client-network-firewall/src/pagination/ListRuleGroupsPaginator.ts
+++ b/clients/client-network-firewall/src/pagination/ListRuleGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRuleGroups(
       throw new Error("Invalid client, expected NetworkFirewall | NetworkFirewallClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-network-firewall/src/pagination/ListTagsForResourcePaginator.ts b/clients/client-network-firewall/src/pagination/ListTagsForResourcePaginator.ts
index 4151f63052eb..31f73b6fc17d 100644
--- a/clients/client-network-firewall/src/pagination/ListTagsForResourcePaginator.ts
+++ b/clients/client-network-firewall/src/pagination/ListTagsForResourcePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTagsForResource(
       throw new Error("Invalid client, expected NetworkFirewall | NetworkFirewallClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-networkmanager/src/pagination/DescribeGlobalNetworksPaginator.ts b/clients/client-networkmanager/src/pagination/DescribeGlobalNetworksPaginator.ts
index 4407d37925b6..457b306ec105 100644
--- a/clients/client-networkmanager/src/pagination/DescribeGlobalNetworksPaginator.ts
+++ b/clients/client-networkmanager/src/pagination/DescribeGlobalNetworksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeGlobalNetworks(
       throw new Error("Invalid client, expected NetworkManager | NetworkManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-networkmanager/src/pagination/GetConnectPeerAssociationsPaginator.ts b/clients/client-networkmanager/src/pagination/GetConnectPeerAssociationsPaginator.ts
index f90811f25748..ccb7224682d6 100644
--- a/clients/client-networkmanager/src/pagination/GetConnectPeerAssociationsPaginator.ts
+++ b/clients/client-networkmanager/src/pagination/GetConnectPeerAssociationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetConnectPeerAssociations(
       throw new Error("Invalid client, expected NetworkManager | NetworkManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-networkmanager/src/pagination/GetConnectionsPaginator.ts b/clients/client-networkmanager/src/pagination/GetConnectionsPaginator.ts
index 35b75fe0192b..9766098e3357 100644
--- a/clients/client-networkmanager/src/pagination/GetConnectionsPaginator.ts
+++ b/clients/client-networkmanager/src/pagination/GetConnectionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetConnections(
       throw new Error("Invalid client, expected NetworkManager | NetworkManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-networkmanager/src/pagination/GetCoreNetworkChangeSetPaginator.ts b/clients/client-networkmanager/src/pagination/GetCoreNetworkChangeSetPaginator.ts
index 6e8e6cb985ae..8d225adc7e10 100644
--- a/clients/client-networkmanager/src/pagination/GetCoreNetworkChangeSetPaginator.ts
+++ b/clients/client-networkmanager/src/pagination/GetCoreNetworkChangeSetPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetCoreNetworkChangeSet(
       throw new Error("Invalid client, expected NetworkManager | NetworkManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-networkmanager/src/pagination/GetCustomerGatewayAssociationsPaginator.ts b/clients/client-networkmanager/src/pagination/GetCustomerGatewayAssociationsPaginator.ts
index 84d427aae4a4..dea7e6234c3c 100644
--- a/clients/client-networkmanager/src/pagination/GetCustomerGatewayAssociationsPaginator.ts
+++ b/clients/client-networkmanager/src/pagination/GetCustomerGatewayAssociationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetCustomerGatewayAssociations(
       throw new Error("Invalid client, expected NetworkManager | NetworkManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-networkmanager/src/pagination/GetDevicesPaginator.ts b/clients/client-networkmanager/src/pagination/GetDevicesPaginator.ts
index ddd7d0ffce1a..fb3a616b2d85 100644
--- a/clients/client-networkmanager/src/pagination/GetDevicesPaginator.ts
+++ b/clients/client-networkmanager/src/pagination/GetDevicesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateGetDevices(
       throw new Error("Invalid client, expected NetworkManager | NetworkManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-networkmanager/src/pagination/GetLinkAssociationsPaginator.ts b/clients/client-networkmanager/src/pagination/GetLinkAssociationsPaginator.ts
index ff8cb353184e..888582af9d88 100644
--- a/clients/client-networkmanager/src/pagination/GetLinkAssociationsPaginator.ts
+++ b/clients/client-networkmanager/src/pagination/GetLinkAssociationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetLinkAssociations(
       throw new Error("Invalid client, expected NetworkManager | NetworkManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-networkmanager/src/pagination/GetLinksPaginator.ts b/clients/client-networkmanager/src/pagination/GetLinksPaginator.ts
index 5f831ad54bdb..1dca157a921c 100644
--- a/clients/client-networkmanager/src/pagination/GetLinksPaginator.ts
+++ b/clients/client-networkmanager/src/pagination/GetLinksPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateGetLinks(
       throw new Error("Invalid client, expected NetworkManager | NetworkManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-networkmanager/src/pagination/GetNetworkResourceCountsPaginator.ts b/clients/client-networkmanager/src/pagination/GetNetworkResourceCountsPaginator.ts
index 0b032cf042c3..9d865002fa07 100644
--- a/clients/client-networkmanager/src/pagination/GetNetworkResourceCountsPaginator.ts
+++ b/clients/client-networkmanager/src/pagination/GetNetworkResourceCountsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetNetworkResourceCounts(
       throw new Error("Invalid client, expected NetworkManager | NetworkManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-networkmanager/src/pagination/GetNetworkResourceRelationshipsPaginator.ts b/clients/client-networkmanager/src/pagination/GetNetworkResourceRelationshipsPaginator.ts
index 7927686ed07a..b6ae6167d65c 100644
--- a/clients/client-networkmanager/src/pagination/GetNetworkResourceRelationshipsPaginator.ts
+++ b/clients/client-networkmanager/src/pagination/GetNetworkResourceRelationshipsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetNetworkResourceRelationships(
       throw new Error("Invalid client, expected NetworkManager | NetworkManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-networkmanager/src/pagination/GetNetworkResourcesPaginator.ts b/clients/client-networkmanager/src/pagination/GetNetworkResourcesPaginator.ts
index dca73551a3a7..107423fe8934 100644
--- a/clients/client-networkmanager/src/pagination/GetNetworkResourcesPaginator.ts
+++ b/clients/client-networkmanager/src/pagination/GetNetworkResourcesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetNetworkResources(
       throw new Error("Invalid client, expected NetworkManager | NetworkManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-networkmanager/src/pagination/GetNetworkTelemetryPaginator.ts b/clients/client-networkmanager/src/pagination/GetNetworkTelemetryPaginator.ts
index fb5268a7521a..8229274cfbf0 100644
--- a/clients/client-networkmanager/src/pagination/GetNetworkTelemetryPaginator.ts
+++ b/clients/client-networkmanager/src/pagination/GetNetworkTelemetryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetNetworkTelemetry(
       throw new Error("Invalid client, expected NetworkManager | NetworkManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-networkmanager/src/pagination/GetSitesPaginator.ts b/clients/client-networkmanager/src/pagination/GetSitesPaginator.ts
index 711dfa4258de..4f765ed697c9 100644
--- a/clients/client-networkmanager/src/pagination/GetSitesPaginator.ts
+++ b/clients/client-networkmanager/src/pagination/GetSitesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateGetSites(
       throw new Error("Invalid client, expected NetworkManager | NetworkManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-networkmanager/src/pagination/GetTransitGatewayConnectPeerAssociationsPaginator.ts b/clients/client-networkmanager/src/pagination/GetTransitGatewayConnectPeerAssociationsPaginator.ts
index 2810edce2e2a..2cf43c1028ba 100644
--- a/clients/client-networkmanager/src/pagination/GetTransitGatewayConnectPeerAssociationsPaginator.ts
+++ b/clients/client-networkmanager/src/pagination/GetTransitGatewayConnectPeerAssociationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetTransitGatewayConnectPeerAssociations(
       throw new Error("Invalid client, expected NetworkManager | NetworkManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-networkmanager/src/pagination/GetTransitGatewayRegistrationsPaginator.ts b/clients/client-networkmanager/src/pagination/GetTransitGatewayRegistrationsPaginator.ts
index 8bb0acdb9935..93bc3a4b880b 100644
--- a/clients/client-networkmanager/src/pagination/GetTransitGatewayRegistrationsPaginator.ts
+++ b/clients/client-networkmanager/src/pagination/GetTransitGatewayRegistrationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetTransitGatewayRegistrations(
       throw new Error("Invalid client, expected NetworkManager | NetworkManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-networkmanager/src/pagination/ListAttachmentsPaginator.ts b/clients/client-networkmanager/src/pagination/ListAttachmentsPaginator.ts
index 7206e83627c2..801a0004c63a 100644
--- a/clients/client-networkmanager/src/pagination/ListAttachmentsPaginator.ts
+++ b/clients/client-networkmanager/src/pagination/ListAttachmentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAttachments(
       throw new Error("Invalid client, expected NetworkManager | NetworkManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-networkmanager/src/pagination/ListConnectPeersPaginator.ts b/clients/client-networkmanager/src/pagination/ListConnectPeersPaginator.ts
index 73ac6a198ed2..132f205ba27a 100644
--- a/clients/client-networkmanager/src/pagination/ListConnectPeersPaginator.ts
+++ b/clients/client-networkmanager/src/pagination/ListConnectPeersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListConnectPeers(
       throw new Error("Invalid client, expected NetworkManager | NetworkManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-networkmanager/src/pagination/ListCoreNetworkPolicyVersionsPaginator.ts b/clients/client-networkmanager/src/pagination/ListCoreNetworkPolicyVersionsPaginator.ts
index a142b5f853c6..6b2bc883d64e 100644
--- a/clients/client-networkmanager/src/pagination/ListCoreNetworkPolicyVersionsPaginator.ts
+++ b/clients/client-networkmanager/src/pagination/ListCoreNetworkPolicyVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCoreNetworkPolicyVersions(
       throw new Error("Invalid client, expected NetworkManager | NetworkManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-networkmanager/src/pagination/ListCoreNetworksPaginator.ts b/clients/client-networkmanager/src/pagination/ListCoreNetworksPaginator.ts
index 56a87758636c..dc612176e80a 100644
--- a/clients/client-networkmanager/src/pagination/ListCoreNetworksPaginator.ts
+++ b/clients/client-networkmanager/src/pagination/ListCoreNetworksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCoreNetworks(
       throw new Error("Invalid client, expected NetworkManager | NetworkManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-nimble/src/pagination/ListEulaAcceptancesPaginator.ts b/clients/client-nimble/src/pagination/ListEulaAcceptancesPaginator.ts
index 62045a965573..7588575a4cb8 100644
--- a/clients/client-nimble/src/pagination/ListEulaAcceptancesPaginator.ts
+++ b/clients/client-nimble/src/pagination/ListEulaAcceptancesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListEulaAcceptances(
       throw new Error("Invalid client, expected Nimble | NimbleClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-nimble/src/pagination/ListEulasPaginator.ts b/clients/client-nimble/src/pagination/ListEulasPaginator.ts
index c50c4656706c..7e643fe71ae6 100644
--- a/clients/client-nimble/src/pagination/ListEulasPaginator.ts
+++ b/clients/client-nimble/src/pagination/ListEulasPaginator.ts
@@ -46,8 +46,9 @@ export async function* paginateListEulas(
       throw new Error("Invalid client, expected Nimble | NimbleClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-nimble/src/pagination/ListLaunchProfileMembersPaginator.ts b/clients/client-nimble/src/pagination/ListLaunchProfileMembersPaginator.ts
index f3b34dd617ad..127eea85c103 100644
--- a/clients/client-nimble/src/pagination/ListLaunchProfileMembersPaginator.ts
+++ b/clients/client-nimble/src/pagination/ListLaunchProfileMembersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListLaunchProfileMembers(
       throw new Error("Invalid client, expected Nimble | NimbleClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-nimble/src/pagination/ListLaunchProfilesPaginator.ts b/clients/client-nimble/src/pagination/ListLaunchProfilesPaginator.ts
index d0597e271e40..1be235ce40c9 100644
--- a/clients/client-nimble/src/pagination/ListLaunchProfilesPaginator.ts
+++ b/clients/client-nimble/src/pagination/ListLaunchProfilesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListLaunchProfiles(
       throw new Error("Invalid client, expected Nimble | NimbleClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-nimble/src/pagination/ListStreamingImagesPaginator.ts b/clients/client-nimble/src/pagination/ListStreamingImagesPaginator.ts
index 5db76f1a6951..b7a42818d685 100644
--- a/clients/client-nimble/src/pagination/ListStreamingImagesPaginator.ts
+++ b/clients/client-nimble/src/pagination/ListStreamingImagesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListStreamingImages(
       throw new Error("Invalid client, expected Nimble | NimbleClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-nimble/src/pagination/ListStreamingSessionsPaginator.ts b/clients/client-nimble/src/pagination/ListStreamingSessionsPaginator.ts
index dea82a0237d0..e40716b424ed 100644
--- a/clients/client-nimble/src/pagination/ListStreamingSessionsPaginator.ts
+++ b/clients/client-nimble/src/pagination/ListStreamingSessionsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListStreamingSessions(
       throw new Error("Invalid client, expected Nimble | NimbleClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-nimble/src/pagination/ListStudioComponentsPaginator.ts b/clients/client-nimble/src/pagination/ListStudioComponentsPaginator.ts
index 67e28e620d5c..fce4ebdb76dc 100644
--- a/clients/client-nimble/src/pagination/ListStudioComponentsPaginator.ts
+++ b/clients/client-nimble/src/pagination/ListStudioComponentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListStudioComponents(
       throw new Error("Invalid client, expected Nimble | NimbleClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-nimble/src/pagination/ListStudioMembersPaginator.ts b/clients/client-nimble/src/pagination/ListStudioMembersPaginator.ts
index f099b7d3e558..bc8580b17473 100644
--- a/clients/client-nimble/src/pagination/ListStudioMembersPaginator.ts
+++ b/clients/client-nimble/src/pagination/ListStudioMembersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListStudioMembers(
       throw new Error("Invalid client, expected Nimble | NimbleClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-nimble/src/pagination/ListStudiosPaginator.ts b/clients/client-nimble/src/pagination/ListStudiosPaginator.ts
index d6a3bb36b177..191f34be766c 100644
--- a/clients/client-nimble/src/pagination/ListStudiosPaginator.ts
+++ b/clients/client-nimble/src/pagination/ListStudiosPaginator.ts
@@ -46,8 +46,9 @@ export async function* paginateListStudios(
       throw new Error("Invalid client, expected Nimble | NimbleClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-opensearch/src/pagination/DescribeDomainAutoTunesPaginator.ts b/clients/client-opensearch/src/pagination/DescribeDomainAutoTunesPaginator.ts
index 93dc22a47b77..fe8fb991e997 100644
--- a/clients/client-opensearch/src/pagination/DescribeDomainAutoTunesPaginator.ts
+++ b/clients/client-opensearch/src/pagination/DescribeDomainAutoTunesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDomainAutoTunes(
       throw new Error("Invalid client, expected OpenSearch | OpenSearchClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-opensearch/src/pagination/DescribeInboundConnectionsPaginator.ts b/clients/client-opensearch/src/pagination/DescribeInboundConnectionsPaginator.ts
index 4a513cf62b11..d246bb05e970 100644
--- a/clients/client-opensearch/src/pagination/DescribeInboundConnectionsPaginator.ts
+++ b/clients/client-opensearch/src/pagination/DescribeInboundConnectionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeInboundConnections(
       throw new Error("Invalid client, expected OpenSearch | OpenSearchClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-opensearch/src/pagination/DescribeOutboundConnectionsPaginator.ts b/clients/client-opensearch/src/pagination/DescribeOutboundConnectionsPaginator.ts
index 3b6e0fc12b0e..ce95f3a9019e 100644
--- a/clients/client-opensearch/src/pagination/DescribeOutboundConnectionsPaginator.ts
+++ b/clients/client-opensearch/src/pagination/DescribeOutboundConnectionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeOutboundConnections(
       throw new Error("Invalid client, expected OpenSearch | OpenSearchClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-opensearch/src/pagination/DescribePackagesPaginator.ts b/clients/client-opensearch/src/pagination/DescribePackagesPaginator.ts
index 54615508f185..21b30bc11eba 100644
--- a/clients/client-opensearch/src/pagination/DescribePackagesPaginator.ts
+++ b/clients/client-opensearch/src/pagination/DescribePackagesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribePackages(
       throw new Error("Invalid client, expected OpenSearch | OpenSearchClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-opensearch/src/pagination/DescribeReservedInstanceOfferingsPaginator.ts b/clients/client-opensearch/src/pagination/DescribeReservedInstanceOfferingsPaginator.ts
index e978b6ef7458..ad97048d1cb9 100644
--- a/clients/client-opensearch/src/pagination/DescribeReservedInstanceOfferingsPaginator.ts
+++ b/clients/client-opensearch/src/pagination/DescribeReservedInstanceOfferingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeReservedInstanceOfferings(
       throw new Error("Invalid client, expected OpenSearch | OpenSearchClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-opensearch/src/pagination/DescribeReservedInstancesPaginator.ts b/clients/client-opensearch/src/pagination/DescribeReservedInstancesPaginator.ts
index 7aeb9088ba2a..d7a2b959c500 100644
--- a/clients/client-opensearch/src/pagination/DescribeReservedInstancesPaginator.ts
+++ b/clients/client-opensearch/src/pagination/DescribeReservedInstancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeReservedInstances(
       throw new Error("Invalid client, expected OpenSearch | OpenSearchClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-opensearch/src/pagination/GetPackageVersionHistoryPaginator.ts b/clients/client-opensearch/src/pagination/GetPackageVersionHistoryPaginator.ts
index 0d29eefcc984..c23dfae549f4 100644
--- a/clients/client-opensearch/src/pagination/GetPackageVersionHistoryPaginator.ts
+++ b/clients/client-opensearch/src/pagination/GetPackageVersionHistoryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetPackageVersionHistory(
       throw new Error("Invalid client, expected OpenSearch | OpenSearchClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-opensearch/src/pagination/GetUpgradeHistoryPaginator.ts b/clients/client-opensearch/src/pagination/GetUpgradeHistoryPaginator.ts
index 5590afb13ed8..a2eb73277b23 100644
--- a/clients/client-opensearch/src/pagination/GetUpgradeHistoryPaginator.ts
+++ b/clients/client-opensearch/src/pagination/GetUpgradeHistoryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetUpgradeHistory(
       throw new Error("Invalid client, expected OpenSearch | OpenSearchClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-opensearch/src/pagination/ListDomainsForPackagePaginator.ts b/clients/client-opensearch/src/pagination/ListDomainsForPackagePaginator.ts
index cfa4953f8ea4..f79241fd440b 100644
--- a/clients/client-opensearch/src/pagination/ListDomainsForPackagePaginator.ts
+++ b/clients/client-opensearch/src/pagination/ListDomainsForPackagePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDomainsForPackage(
       throw new Error("Invalid client, expected OpenSearch | OpenSearchClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-opensearch/src/pagination/ListInstanceTypeDetailsPaginator.ts b/clients/client-opensearch/src/pagination/ListInstanceTypeDetailsPaginator.ts
index b8a75eabd05b..9993ef2502c3 100644
--- a/clients/client-opensearch/src/pagination/ListInstanceTypeDetailsPaginator.ts
+++ b/clients/client-opensearch/src/pagination/ListInstanceTypeDetailsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListInstanceTypeDetails(
       throw new Error("Invalid client, expected OpenSearch | OpenSearchClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-opensearch/src/pagination/ListPackagesForDomainPaginator.ts b/clients/client-opensearch/src/pagination/ListPackagesForDomainPaginator.ts
index 64e9d2133b0e..e7d0ef28803c 100644
--- a/clients/client-opensearch/src/pagination/ListPackagesForDomainPaginator.ts
+++ b/clients/client-opensearch/src/pagination/ListPackagesForDomainPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPackagesForDomain(
       throw new Error("Invalid client, expected OpenSearch | OpenSearchClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-opensearch/src/pagination/ListVersionsPaginator.ts b/clients/client-opensearch/src/pagination/ListVersionsPaginator.ts
index c40f8957ff02..c0a2083d59ad 100644
--- a/clients/client-opensearch/src/pagination/ListVersionsPaginator.ts
+++ b/clients/client-opensearch/src/pagination/ListVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListVersions(
       throw new Error("Invalid client, expected OpenSearch | OpenSearchClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-opsworks/src/pagination/DescribeEcsClustersPaginator.ts b/clients/client-opsworks/src/pagination/DescribeEcsClustersPaginator.ts
index 86cb7a8a4595..3501e60db601 100644
--- a/clients/client-opsworks/src/pagination/DescribeEcsClustersPaginator.ts
+++ b/clients/client-opsworks/src/pagination/DescribeEcsClustersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEcsClusters(
       throw new Error("Invalid client, expected OpsWorks | OpsWorksClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-opsworkscm/src/pagination/DescribeBackupsPaginator.ts b/clients/client-opsworkscm/src/pagination/DescribeBackupsPaginator.ts
index afa880f84f63..3c12a8a60de8 100644
--- a/clients/client-opsworkscm/src/pagination/DescribeBackupsPaginator.ts
+++ b/clients/client-opsworkscm/src/pagination/DescribeBackupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeBackups(
       throw new Error("Invalid client, expected OpsWorksCM | OpsWorksCMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-opsworkscm/src/pagination/DescribeEventsPaginator.ts b/clients/client-opsworkscm/src/pagination/DescribeEventsPaginator.ts
index 78afdf2872c5..0e40dce7eb2f 100644
--- a/clients/client-opsworkscm/src/pagination/DescribeEventsPaginator.ts
+++ b/clients/client-opsworkscm/src/pagination/DescribeEventsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEvents(
       throw new Error("Invalid client, expected OpsWorksCM | OpsWorksCMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-opsworkscm/src/pagination/DescribeServersPaginator.ts b/clients/client-opsworkscm/src/pagination/DescribeServersPaginator.ts
index b29cb19a5941..c708bd79f3ee 100644
--- a/clients/client-opsworkscm/src/pagination/DescribeServersPaginator.ts
+++ b/clients/client-opsworkscm/src/pagination/DescribeServersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeServers(
       throw new Error("Invalid client, expected OpsWorksCM | OpsWorksCMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-opsworkscm/src/pagination/ListTagsForResourcePaginator.ts b/clients/client-opsworkscm/src/pagination/ListTagsForResourcePaginator.ts
index dd091002d933..9f285338309d 100644
--- a/clients/client-opsworkscm/src/pagination/ListTagsForResourcePaginator.ts
+++ b/clients/client-opsworkscm/src/pagination/ListTagsForResourcePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTagsForResource(
       throw new Error("Invalid client, expected OpsWorksCM | OpsWorksCMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-organizations/src/pagination/ListAWSServiceAccessForOrganizationPaginator.ts b/clients/client-organizations/src/pagination/ListAWSServiceAccessForOrganizationPaginator.ts
index eece0e573148..e2c664e512b1 100644
--- a/clients/client-organizations/src/pagination/ListAWSServiceAccessForOrganizationPaginator.ts
+++ b/clients/client-organizations/src/pagination/ListAWSServiceAccessForOrganizationPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAWSServiceAccessForOrganization(
       throw new Error("Invalid client, expected Organizations | OrganizationsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-organizations/src/pagination/ListAccountsForParentPaginator.ts b/clients/client-organizations/src/pagination/ListAccountsForParentPaginator.ts
index 63f2ca2c7870..68a9bbd0b2ec 100644
--- a/clients/client-organizations/src/pagination/ListAccountsForParentPaginator.ts
+++ b/clients/client-organizations/src/pagination/ListAccountsForParentPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAccountsForParent(
       throw new Error("Invalid client, expected Organizations | OrganizationsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-organizations/src/pagination/ListAccountsPaginator.ts b/clients/client-organizations/src/pagination/ListAccountsPaginator.ts
index efebffc68e3a..33fad2873344 100644
--- a/clients/client-organizations/src/pagination/ListAccountsPaginator.ts
+++ b/clients/client-organizations/src/pagination/ListAccountsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAccounts(
       throw new Error("Invalid client, expected Organizations | OrganizationsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-organizations/src/pagination/ListChildrenPaginator.ts b/clients/client-organizations/src/pagination/ListChildrenPaginator.ts
index aab1a0c80d5b..f0cbb36ade72 100644
--- a/clients/client-organizations/src/pagination/ListChildrenPaginator.ts
+++ b/clients/client-organizations/src/pagination/ListChildrenPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListChildren(
       throw new Error("Invalid client, expected Organizations | OrganizationsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-organizations/src/pagination/ListCreateAccountStatusPaginator.ts b/clients/client-organizations/src/pagination/ListCreateAccountStatusPaginator.ts
index cb663f937883..6977412b761b 100644
--- a/clients/client-organizations/src/pagination/ListCreateAccountStatusPaginator.ts
+++ b/clients/client-organizations/src/pagination/ListCreateAccountStatusPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCreateAccountStatus(
       throw new Error("Invalid client, expected Organizations | OrganizationsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-organizations/src/pagination/ListDelegatedAdministratorsPaginator.ts b/clients/client-organizations/src/pagination/ListDelegatedAdministratorsPaginator.ts
index 8b26e712eed4..b04d9f6d77f2 100644
--- a/clients/client-organizations/src/pagination/ListDelegatedAdministratorsPaginator.ts
+++ b/clients/client-organizations/src/pagination/ListDelegatedAdministratorsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDelegatedAdministrators(
       throw new Error("Invalid client, expected Organizations | OrganizationsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-organizations/src/pagination/ListDelegatedServicesForAccountPaginator.ts b/clients/client-organizations/src/pagination/ListDelegatedServicesForAccountPaginator.ts
index 7bda65517ff8..a329febe0aaa 100644
--- a/clients/client-organizations/src/pagination/ListDelegatedServicesForAccountPaginator.ts
+++ b/clients/client-organizations/src/pagination/ListDelegatedServicesForAccountPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDelegatedServicesForAccount(
       throw new Error("Invalid client, expected Organizations | OrganizationsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-organizations/src/pagination/ListHandshakesForAccountPaginator.ts b/clients/client-organizations/src/pagination/ListHandshakesForAccountPaginator.ts
index b864a4d6acd4..b86ff75b0e58 100644
--- a/clients/client-organizations/src/pagination/ListHandshakesForAccountPaginator.ts
+++ b/clients/client-organizations/src/pagination/ListHandshakesForAccountPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListHandshakesForAccount(
       throw new Error("Invalid client, expected Organizations | OrganizationsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-organizations/src/pagination/ListHandshakesForOrganizationPaginator.ts b/clients/client-organizations/src/pagination/ListHandshakesForOrganizationPaginator.ts
index 9f6228e3f769..94cf8a271d3a 100644
--- a/clients/client-organizations/src/pagination/ListHandshakesForOrganizationPaginator.ts
+++ b/clients/client-organizations/src/pagination/ListHandshakesForOrganizationPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListHandshakesForOrganization(
       throw new Error("Invalid client, expected Organizations | OrganizationsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-organizations/src/pagination/ListOrganizationalUnitsForParentPaginator.ts b/clients/client-organizations/src/pagination/ListOrganizationalUnitsForParentPaginator.ts
index d86cf978ca04..1ef087b2fbdc 100644
--- a/clients/client-organizations/src/pagination/ListOrganizationalUnitsForParentPaginator.ts
+++ b/clients/client-organizations/src/pagination/ListOrganizationalUnitsForParentPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListOrganizationalUnitsForParent(
       throw new Error("Invalid client, expected Organizations | OrganizationsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-organizations/src/pagination/ListParentsPaginator.ts b/clients/client-organizations/src/pagination/ListParentsPaginator.ts
index 8d959a37b2c5..cc60691f0d79 100644
--- a/clients/client-organizations/src/pagination/ListParentsPaginator.ts
+++ b/clients/client-organizations/src/pagination/ListParentsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListParents(
       throw new Error("Invalid client, expected Organizations | OrganizationsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-organizations/src/pagination/ListPoliciesForTargetPaginator.ts b/clients/client-organizations/src/pagination/ListPoliciesForTargetPaginator.ts
index 856f39fbd724..3596f545bd8c 100644
--- a/clients/client-organizations/src/pagination/ListPoliciesForTargetPaginator.ts
+++ b/clients/client-organizations/src/pagination/ListPoliciesForTargetPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPoliciesForTarget(
       throw new Error("Invalid client, expected Organizations | OrganizationsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-organizations/src/pagination/ListPoliciesPaginator.ts b/clients/client-organizations/src/pagination/ListPoliciesPaginator.ts
index f4018b347f7e..f49ebccbaa94 100644
--- a/clients/client-organizations/src/pagination/ListPoliciesPaginator.ts
+++ b/clients/client-organizations/src/pagination/ListPoliciesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPolicies(
       throw new Error("Invalid client, expected Organizations | OrganizationsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-organizations/src/pagination/ListRootsPaginator.ts b/clients/client-organizations/src/pagination/ListRootsPaginator.ts
index ace0aaf683b5..02ae7d6d59f8 100644
--- a/clients/client-organizations/src/pagination/ListRootsPaginator.ts
+++ b/clients/client-organizations/src/pagination/ListRootsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListRoots(
       throw new Error("Invalid client, expected Organizations | OrganizationsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-organizations/src/pagination/ListTagsForResourcePaginator.ts b/clients/client-organizations/src/pagination/ListTagsForResourcePaginator.ts
index bfd6c6c24fcb..95b472e38dc5 100644
--- a/clients/client-organizations/src/pagination/ListTagsForResourcePaginator.ts
+++ b/clients/client-organizations/src/pagination/ListTagsForResourcePaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListTagsForResource(
       throw new Error("Invalid client, expected Organizations | OrganizationsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-organizations/src/pagination/ListTargetsForPolicyPaginator.ts b/clients/client-organizations/src/pagination/ListTargetsForPolicyPaginator.ts
index 6ef7fef351df..84d0071ec806 100644
--- a/clients/client-organizations/src/pagination/ListTargetsForPolicyPaginator.ts
+++ b/clients/client-organizations/src/pagination/ListTargetsForPolicyPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTargetsForPolicy(
       throw new Error("Invalid client, expected Organizations | OrganizationsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-outposts/src/pagination/ListCatalogItemsPaginator.ts b/clients/client-outposts/src/pagination/ListCatalogItemsPaginator.ts
index 787b40bc55ae..45a1f92ec924 100644
--- a/clients/client-outposts/src/pagination/ListCatalogItemsPaginator.ts
+++ b/clients/client-outposts/src/pagination/ListCatalogItemsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCatalogItems(
       throw new Error("Invalid client, expected Outposts | OutpostsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-outposts/src/pagination/ListOrdersPaginator.ts b/clients/client-outposts/src/pagination/ListOrdersPaginator.ts
index 565aa98511af..6d3f8b287f6e 100644
--- a/clients/client-outposts/src/pagination/ListOrdersPaginator.ts
+++ b/clients/client-outposts/src/pagination/ListOrdersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListOrders(
       throw new Error("Invalid client, expected Outposts | OutpostsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-outposts/src/pagination/ListOutpostsPaginator.ts b/clients/client-outposts/src/pagination/ListOutpostsPaginator.ts
index e071db9ec08f..3a65ef91e76b 100644
--- a/clients/client-outposts/src/pagination/ListOutpostsPaginator.ts
+++ b/clients/client-outposts/src/pagination/ListOutpostsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListOutposts(
       throw new Error("Invalid client, expected Outposts | OutpostsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-outposts/src/pagination/ListSitesPaginator.ts b/clients/client-outposts/src/pagination/ListSitesPaginator.ts
index e7b025c62570..b995740369f6 100644
--- a/clients/client-outposts/src/pagination/ListSitesPaginator.ts
+++ b/clients/client-outposts/src/pagination/ListSitesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListSites(
       throw new Error("Invalid client, expected Outposts | OutpostsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-panorama/src/pagination/ListApplicationInstanceDependenciesPaginator.ts b/clients/client-panorama/src/pagination/ListApplicationInstanceDependenciesPaginator.ts
index 052f6a56eff9..7936b9016cad 100644
--- a/clients/client-panorama/src/pagination/ListApplicationInstanceDependenciesPaginator.ts
+++ b/clients/client-panorama/src/pagination/ListApplicationInstanceDependenciesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListApplicationInstanceDependencies(
       throw new Error("Invalid client, expected Panorama | PanoramaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-panorama/src/pagination/ListApplicationInstanceNodeInstancesPaginator.ts b/clients/client-panorama/src/pagination/ListApplicationInstanceNodeInstancesPaginator.ts
index a8f8221ac713..f22ebfe60938 100644
--- a/clients/client-panorama/src/pagination/ListApplicationInstanceNodeInstancesPaginator.ts
+++ b/clients/client-panorama/src/pagination/ListApplicationInstanceNodeInstancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListApplicationInstanceNodeInstances(
       throw new Error("Invalid client, expected Panorama | PanoramaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-panorama/src/pagination/ListApplicationInstancesPaginator.ts b/clients/client-panorama/src/pagination/ListApplicationInstancesPaginator.ts
index fc1fb232d7e1..f32ed7beb878 100644
--- a/clients/client-panorama/src/pagination/ListApplicationInstancesPaginator.ts
+++ b/clients/client-panorama/src/pagination/ListApplicationInstancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListApplicationInstances(
       throw new Error("Invalid client, expected Panorama | PanoramaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-panorama/src/pagination/ListDevicesJobsPaginator.ts b/clients/client-panorama/src/pagination/ListDevicesJobsPaginator.ts
index ca64c86569f4..bfc9013db08c 100644
--- a/clients/client-panorama/src/pagination/ListDevicesJobsPaginator.ts
+++ b/clients/client-panorama/src/pagination/ListDevicesJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDevicesJobs(
       throw new Error("Invalid client, expected Panorama | PanoramaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-panorama/src/pagination/ListDevicesPaginator.ts b/clients/client-panorama/src/pagination/ListDevicesPaginator.ts
index cee6bb41a350..14de966e6167 100644
--- a/clients/client-panorama/src/pagination/ListDevicesPaginator.ts
+++ b/clients/client-panorama/src/pagination/ListDevicesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListDevices(
       throw new Error("Invalid client, expected Panorama | PanoramaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-panorama/src/pagination/ListNodeFromTemplateJobsPaginator.ts b/clients/client-panorama/src/pagination/ListNodeFromTemplateJobsPaginator.ts
index fab8ac590aea..d31d7f802f8b 100644
--- a/clients/client-panorama/src/pagination/ListNodeFromTemplateJobsPaginator.ts
+++ b/clients/client-panorama/src/pagination/ListNodeFromTemplateJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListNodeFromTemplateJobs(
       throw new Error("Invalid client, expected Panorama | PanoramaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-panorama/src/pagination/ListNodesPaginator.ts b/clients/client-panorama/src/pagination/ListNodesPaginator.ts
index c291589fa730..bea453edc9ec 100644
--- a/clients/client-panorama/src/pagination/ListNodesPaginator.ts
+++ b/clients/client-panorama/src/pagination/ListNodesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListNodes(
       throw new Error("Invalid client, expected Panorama | PanoramaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-panorama/src/pagination/ListPackageImportJobsPaginator.ts b/clients/client-panorama/src/pagination/ListPackageImportJobsPaginator.ts
index 13c8fd54ad38..8fe4d24885a6 100644
--- a/clients/client-panorama/src/pagination/ListPackageImportJobsPaginator.ts
+++ b/clients/client-panorama/src/pagination/ListPackageImportJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPackageImportJobs(
       throw new Error("Invalid client, expected Panorama | PanoramaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-panorama/src/pagination/ListPackagesPaginator.ts b/clients/client-panorama/src/pagination/ListPackagesPaginator.ts
index 45e6522b5a6b..6815cb74b96b 100644
--- a/clients/client-panorama/src/pagination/ListPackagesPaginator.ts
+++ b/clients/client-panorama/src/pagination/ListPackagesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPackages(
       throw new Error("Invalid client, expected Panorama | PanoramaClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-personalize/src/pagination/ListBatchInferenceJobsPaginator.ts b/clients/client-personalize/src/pagination/ListBatchInferenceJobsPaginator.ts
index d31a467dcfdd..44d987730d99 100644
--- a/clients/client-personalize/src/pagination/ListBatchInferenceJobsPaginator.ts
+++ b/clients/client-personalize/src/pagination/ListBatchInferenceJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListBatchInferenceJobs(
       throw new Error("Invalid client, expected Personalize | PersonalizeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-personalize/src/pagination/ListBatchSegmentJobsPaginator.ts b/clients/client-personalize/src/pagination/ListBatchSegmentJobsPaginator.ts
index efb335501d32..40355103f448 100644
--- a/clients/client-personalize/src/pagination/ListBatchSegmentJobsPaginator.ts
+++ b/clients/client-personalize/src/pagination/ListBatchSegmentJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListBatchSegmentJobs(
       throw new Error("Invalid client, expected Personalize | PersonalizeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-personalize/src/pagination/ListCampaignsPaginator.ts b/clients/client-personalize/src/pagination/ListCampaignsPaginator.ts
index 731a64813b52..b29b5f40ef19 100644
--- a/clients/client-personalize/src/pagination/ListCampaignsPaginator.ts
+++ b/clients/client-personalize/src/pagination/ListCampaignsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCampaigns(
       throw new Error("Invalid client, expected Personalize | PersonalizeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-personalize/src/pagination/ListDatasetExportJobsPaginator.ts b/clients/client-personalize/src/pagination/ListDatasetExportJobsPaginator.ts
index d46f559c4cbd..afdcd805ca12 100644
--- a/clients/client-personalize/src/pagination/ListDatasetExportJobsPaginator.ts
+++ b/clients/client-personalize/src/pagination/ListDatasetExportJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDatasetExportJobs(
       throw new Error("Invalid client, expected Personalize | PersonalizeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-personalize/src/pagination/ListDatasetGroupsPaginator.ts b/clients/client-personalize/src/pagination/ListDatasetGroupsPaginator.ts
index 094c960773ec..c89d4daea5d9 100644
--- a/clients/client-personalize/src/pagination/ListDatasetGroupsPaginator.ts
+++ b/clients/client-personalize/src/pagination/ListDatasetGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDatasetGroups(
       throw new Error("Invalid client, expected Personalize | PersonalizeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-personalize/src/pagination/ListDatasetImportJobsPaginator.ts b/clients/client-personalize/src/pagination/ListDatasetImportJobsPaginator.ts
index c587e2e5ccf4..e3175cb4730a 100644
--- a/clients/client-personalize/src/pagination/ListDatasetImportJobsPaginator.ts
+++ b/clients/client-personalize/src/pagination/ListDatasetImportJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDatasetImportJobs(
       throw new Error("Invalid client, expected Personalize | PersonalizeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-personalize/src/pagination/ListDatasetsPaginator.ts b/clients/client-personalize/src/pagination/ListDatasetsPaginator.ts
index 1806baa4fc03..dea8c11168fc 100644
--- a/clients/client-personalize/src/pagination/ListDatasetsPaginator.ts
+++ b/clients/client-personalize/src/pagination/ListDatasetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDatasets(
       throw new Error("Invalid client, expected Personalize | PersonalizeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-personalize/src/pagination/ListEventTrackersPaginator.ts b/clients/client-personalize/src/pagination/ListEventTrackersPaginator.ts
index 6063e11bbaa2..c603327fcd5b 100644
--- a/clients/client-personalize/src/pagination/ListEventTrackersPaginator.ts
+++ b/clients/client-personalize/src/pagination/ListEventTrackersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEventTrackers(
       throw new Error("Invalid client, expected Personalize | PersonalizeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-personalize/src/pagination/ListFiltersPaginator.ts b/clients/client-personalize/src/pagination/ListFiltersPaginator.ts
index 851da6f8679f..664ffdde7cbb 100644
--- a/clients/client-personalize/src/pagination/ListFiltersPaginator.ts
+++ b/clients/client-personalize/src/pagination/ListFiltersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListFilters(
       throw new Error("Invalid client, expected Personalize | PersonalizeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-personalize/src/pagination/ListRecipesPaginator.ts b/clients/client-personalize/src/pagination/ListRecipesPaginator.ts
index 106444795320..d17976ce2173 100644
--- a/clients/client-personalize/src/pagination/ListRecipesPaginator.ts
+++ b/clients/client-personalize/src/pagination/ListRecipesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListRecipes(
       throw new Error("Invalid client, expected Personalize | PersonalizeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-personalize/src/pagination/ListRecommendersPaginator.ts b/clients/client-personalize/src/pagination/ListRecommendersPaginator.ts
index 6ab65fa1c67d..3086039eabb2 100644
--- a/clients/client-personalize/src/pagination/ListRecommendersPaginator.ts
+++ b/clients/client-personalize/src/pagination/ListRecommendersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRecommenders(
       throw new Error("Invalid client, expected Personalize | PersonalizeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-personalize/src/pagination/ListSchemasPaginator.ts b/clients/client-personalize/src/pagination/ListSchemasPaginator.ts
index caf6885d7e4c..9b7c57d0a92b 100644
--- a/clients/client-personalize/src/pagination/ListSchemasPaginator.ts
+++ b/clients/client-personalize/src/pagination/ListSchemasPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListSchemas(
       throw new Error("Invalid client, expected Personalize | PersonalizeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-personalize/src/pagination/ListSolutionVersionsPaginator.ts b/clients/client-personalize/src/pagination/ListSolutionVersionsPaginator.ts
index 7204efb9fe66..1cdb5e79cb08 100644
--- a/clients/client-personalize/src/pagination/ListSolutionVersionsPaginator.ts
+++ b/clients/client-personalize/src/pagination/ListSolutionVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSolutionVersions(
       throw new Error("Invalid client, expected Personalize | PersonalizeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-personalize/src/pagination/ListSolutionsPaginator.ts b/clients/client-personalize/src/pagination/ListSolutionsPaginator.ts
index c0c2d75d8350..405c2130d9e1 100644
--- a/clients/client-personalize/src/pagination/ListSolutionsPaginator.ts
+++ b/clients/client-personalize/src/pagination/ListSolutionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSolutions(
       throw new Error("Invalid client, expected Personalize | PersonalizeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-pi/src/pagination/DescribeDimensionKeysPaginator.ts b/clients/client-pi/src/pagination/DescribeDimensionKeysPaginator.ts
index 2101a37659e5..429bec1af311 100644
--- a/clients/client-pi/src/pagination/DescribeDimensionKeysPaginator.ts
+++ b/clients/client-pi/src/pagination/DescribeDimensionKeysPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDimensionKeys(
       throw new Error("Invalid client, expected PI | PIClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-pi/src/pagination/GetResourceMetricsPaginator.ts b/clients/client-pi/src/pagination/GetResourceMetricsPaginator.ts
index 888df7d60458..0b6ad9f53576 100644
--- a/clients/client-pi/src/pagination/GetResourceMetricsPaginator.ts
+++ b/clients/client-pi/src/pagination/GetResourceMetricsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetResourceMetrics(
       throw new Error("Invalid client, expected PI | PIClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-pi/src/pagination/ListAvailableResourceDimensionsPaginator.ts b/clients/client-pi/src/pagination/ListAvailableResourceDimensionsPaginator.ts
index e99c3a0234fa..c2548807b917 100644
--- a/clients/client-pi/src/pagination/ListAvailableResourceDimensionsPaginator.ts
+++ b/clients/client-pi/src/pagination/ListAvailableResourceDimensionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAvailableResourceDimensions(
       throw new Error("Invalid client, expected PI | PIClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-pi/src/pagination/ListAvailableResourceMetricsPaginator.ts b/clients/client-pi/src/pagination/ListAvailableResourceMetricsPaginator.ts
index 095cc77137d8..f029029154ec 100644
--- a/clients/client-pi/src/pagination/ListAvailableResourceMetricsPaginator.ts
+++ b/clients/client-pi/src/pagination/ListAvailableResourceMetricsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAvailableResourceMetrics(
       throw new Error("Invalid client, expected PI | PIClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-pinpoint-email/src/pagination/GetDedicatedIpsPaginator.ts b/clients/client-pinpoint-email/src/pagination/GetDedicatedIpsPaginator.ts
index 336cb752a943..bed5cce37eae 100644
--- a/clients/client-pinpoint-email/src/pagination/GetDedicatedIpsPaginator.ts
+++ b/clients/client-pinpoint-email/src/pagination/GetDedicatedIpsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetDedicatedIps(
       throw new Error("Invalid client, expected PinpointEmail | PinpointEmailClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-pinpoint-email/src/pagination/ListConfigurationSetsPaginator.ts b/clients/client-pinpoint-email/src/pagination/ListConfigurationSetsPaginator.ts
index 6997a584bc48..1f5b9976a105 100644
--- a/clients/client-pinpoint-email/src/pagination/ListConfigurationSetsPaginator.ts
+++ b/clients/client-pinpoint-email/src/pagination/ListConfigurationSetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListConfigurationSets(
       throw new Error("Invalid client, expected PinpointEmail | PinpointEmailClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-pinpoint-email/src/pagination/ListDedicatedIpPoolsPaginator.ts b/clients/client-pinpoint-email/src/pagination/ListDedicatedIpPoolsPaginator.ts
index 311415ecba00..08cff26119d9 100644
--- a/clients/client-pinpoint-email/src/pagination/ListDedicatedIpPoolsPaginator.ts
+++ b/clients/client-pinpoint-email/src/pagination/ListDedicatedIpPoolsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDedicatedIpPools(
       throw new Error("Invalid client, expected PinpointEmail | PinpointEmailClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-pinpoint-email/src/pagination/ListDeliverabilityTestReportsPaginator.ts b/clients/client-pinpoint-email/src/pagination/ListDeliverabilityTestReportsPaginator.ts
index a39f12450f99..cfcd88d7fa7d 100644
--- a/clients/client-pinpoint-email/src/pagination/ListDeliverabilityTestReportsPaginator.ts
+++ b/clients/client-pinpoint-email/src/pagination/ListDeliverabilityTestReportsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDeliverabilityTestReports(
       throw new Error("Invalid client, expected PinpointEmail | PinpointEmailClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-pinpoint-email/src/pagination/ListDomainDeliverabilityCampaignsPaginator.ts b/clients/client-pinpoint-email/src/pagination/ListDomainDeliverabilityCampaignsPaginator.ts
index 0d219ab420de..048f336375ca 100644
--- a/clients/client-pinpoint-email/src/pagination/ListDomainDeliverabilityCampaignsPaginator.ts
+++ b/clients/client-pinpoint-email/src/pagination/ListDomainDeliverabilityCampaignsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDomainDeliverabilityCampaigns(
       throw new Error("Invalid client, expected PinpointEmail | PinpointEmailClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-pinpoint-email/src/pagination/ListEmailIdentitiesPaginator.ts b/clients/client-pinpoint-email/src/pagination/ListEmailIdentitiesPaginator.ts
index 3499ac399ddd..d9b07d246240 100644
--- a/clients/client-pinpoint-email/src/pagination/ListEmailIdentitiesPaginator.ts
+++ b/clients/client-pinpoint-email/src/pagination/ListEmailIdentitiesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEmailIdentities(
       throw new Error("Invalid client, expected PinpointEmail | PinpointEmailClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeAccountAttributesPaginator.ts b/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeAccountAttributesPaginator.ts
index f1ded263e04a..cca3a1e9eada 100644
--- a/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeAccountAttributesPaginator.ts
+++ b/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeAccountAttributesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeAccountAttributes(
       throw new Error("Invalid client, expected PinpointSMSVoiceV2 | PinpointSMSVoiceV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeAccountLimitsPaginator.ts b/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeAccountLimitsPaginator.ts
index bd7d91dd77cd..bdfc50dd2984 100644
--- a/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeAccountLimitsPaginator.ts
+++ b/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeAccountLimitsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeAccountLimits(
       throw new Error("Invalid client, expected PinpointSMSVoiceV2 | PinpointSMSVoiceV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeConfigurationSetsPaginator.ts b/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeConfigurationSetsPaginator.ts
index 84e54089e9cf..93613568a4c7 100644
--- a/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeConfigurationSetsPaginator.ts
+++ b/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeConfigurationSetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeConfigurationSets(
       throw new Error("Invalid client, expected PinpointSMSVoiceV2 | PinpointSMSVoiceV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeKeywordsPaginator.ts b/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeKeywordsPaginator.ts
index b80ef87eb04b..a181748c15fd 100644
--- a/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeKeywordsPaginator.ts
+++ b/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeKeywordsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeKeywords(
       throw new Error("Invalid client, expected PinpointSMSVoiceV2 | PinpointSMSVoiceV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeOptOutListsPaginator.ts b/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeOptOutListsPaginator.ts
index 581142d0e267..5f44844932e2 100644
--- a/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeOptOutListsPaginator.ts
+++ b/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeOptOutListsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeOptOutLists(
       throw new Error("Invalid client, expected PinpointSMSVoiceV2 | PinpointSMSVoiceV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeOptedOutNumbersPaginator.ts b/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeOptedOutNumbersPaginator.ts
index cf4e1897db87..8e31b2c102ed 100644
--- a/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeOptedOutNumbersPaginator.ts
+++ b/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeOptedOutNumbersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeOptedOutNumbers(
       throw new Error("Invalid client, expected PinpointSMSVoiceV2 | PinpointSMSVoiceV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribePhoneNumbersPaginator.ts b/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribePhoneNumbersPaginator.ts
index 9e197f27f8c2..639fbb84adaf 100644
--- a/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribePhoneNumbersPaginator.ts
+++ b/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribePhoneNumbersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribePhoneNumbers(
       throw new Error("Invalid client, expected PinpointSMSVoiceV2 | PinpointSMSVoiceV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribePoolsPaginator.ts b/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribePoolsPaginator.ts
index 67c246fc734c..c21a28b490de 100644
--- a/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribePoolsPaginator.ts
+++ b/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribePoolsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribePools(
       throw new Error("Invalid client, expected PinpointSMSVoiceV2 | PinpointSMSVoiceV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeSenderIdsPaginator.ts b/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeSenderIdsPaginator.ts
index 7d499e941d13..e63aa871f4be 100644
--- a/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeSenderIdsPaginator.ts
+++ b/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeSenderIdsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeSenderIds(
       throw new Error("Invalid client, expected PinpointSMSVoiceV2 | PinpointSMSVoiceV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeSpendLimitsPaginator.ts b/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeSpendLimitsPaginator.ts
index 7b203aeca0fc..0cda2bf89d76 100644
--- a/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeSpendLimitsPaginator.ts
+++ b/clients/client-pinpoint-sms-voice-v2/src/pagination/DescribeSpendLimitsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeSpendLimits(
       throw new Error("Invalid client, expected PinpointSMSVoiceV2 | PinpointSMSVoiceV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-pinpoint-sms-voice-v2/src/pagination/ListPoolOriginationIdentitiesPaginator.ts b/clients/client-pinpoint-sms-voice-v2/src/pagination/ListPoolOriginationIdentitiesPaginator.ts
index 823076f22f96..df170b3e60ef 100644
--- a/clients/client-pinpoint-sms-voice-v2/src/pagination/ListPoolOriginationIdentitiesPaginator.ts
+++ b/clients/client-pinpoint-sms-voice-v2/src/pagination/ListPoolOriginationIdentitiesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPoolOriginationIdentities(
       throw new Error("Invalid client, expected PinpointSMSVoiceV2 | PinpointSMSVoiceV2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-polly/src/pagination/ListSpeechSynthesisTasksPaginator.ts b/clients/client-polly/src/pagination/ListSpeechSynthesisTasksPaginator.ts
index c4c67a542e95..1891e1ad51e4 100644
--- a/clients/client-polly/src/pagination/ListSpeechSynthesisTasksPaginator.ts
+++ b/clients/client-polly/src/pagination/ListSpeechSynthesisTasksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSpeechSynthesisTasks(
       throw new Error("Invalid client, expected Polly | PollyClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-pricing/src/pagination/DescribeServicesPaginator.ts b/clients/client-pricing/src/pagination/DescribeServicesPaginator.ts
index bf8b659c6c28..835f59f045d1 100644
--- a/clients/client-pricing/src/pagination/DescribeServicesPaginator.ts
+++ b/clients/client-pricing/src/pagination/DescribeServicesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeServices(
       throw new Error("Invalid client, expected Pricing | PricingClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-pricing/src/pagination/GetAttributeValuesPaginator.ts b/clients/client-pricing/src/pagination/GetAttributeValuesPaginator.ts
index dbbb9e6ed2ec..01a0b7452110 100644
--- a/clients/client-pricing/src/pagination/GetAttributeValuesPaginator.ts
+++ b/clients/client-pricing/src/pagination/GetAttributeValuesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetAttributeValues(
       throw new Error("Invalid client, expected Pricing | PricingClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-pricing/src/pagination/GetProductsPaginator.ts b/clients/client-pricing/src/pagination/GetProductsPaginator.ts
index cd6ddb0d1d7d..5a92f865e887 100644
--- a/clients/client-pricing/src/pagination/GetProductsPaginator.ts
+++ b/clients/client-pricing/src/pagination/GetProductsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateGetProducts(
       throw new Error("Invalid client, expected Pricing | PricingClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-proton/src/pagination/ListEnvironmentAccountConnectionsPaginator.ts b/clients/client-proton/src/pagination/ListEnvironmentAccountConnectionsPaginator.ts
index 1ea2474faf40..1febcf8ff33f 100644
--- a/clients/client-proton/src/pagination/ListEnvironmentAccountConnectionsPaginator.ts
+++ b/clients/client-proton/src/pagination/ListEnvironmentAccountConnectionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEnvironmentAccountConnections(
       throw new Error("Invalid client, expected Proton | ProtonClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-proton/src/pagination/ListEnvironmentOutputsPaginator.ts b/clients/client-proton/src/pagination/ListEnvironmentOutputsPaginator.ts
index 6fdd0697c969..426e40fb2f0b 100644
--- a/clients/client-proton/src/pagination/ListEnvironmentOutputsPaginator.ts
+++ b/clients/client-proton/src/pagination/ListEnvironmentOutputsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListEnvironmentOutputs(
       throw new Error("Invalid client, expected Proton | ProtonClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-proton/src/pagination/ListEnvironmentProvisionedResourcesPaginator.ts b/clients/client-proton/src/pagination/ListEnvironmentProvisionedResourcesPaginator.ts
index 4b7d348f6892..cf220b7fab0a 100644
--- a/clients/client-proton/src/pagination/ListEnvironmentProvisionedResourcesPaginator.ts
+++ b/clients/client-proton/src/pagination/ListEnvironmentProvisionedResourcesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListEnvironmentProvisionedResources(
       throw new Error("Invalid client, expected Proton | ProtonClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-proton/src/pagination/ListEnvironmentTemplateVersionsPaginator.ts b/clients/client-proton/src/pagination/ListEnvironmentTemplateVersionsPaginator.ts
index 05b9b99b7dc5..f1bdfecae6ad 100644
--- a/clients/client-proton/src/pagination/ListEnvironmentTemplateVersionsPaginator.ts
+++ b/clients/client-proton/src/pagination/ListEnvironmentTemplateVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEnvironmentTemplateVersions(
       throw new Error("Invalid client, expected Proton | ProtonClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-proton/src/pagination/ListEnvironmentTemplatesPaginator.ts b/clients/client-proton/src/pagination/ListEnvironmentTemplatesPaginator.ts
index 1ae621b9d319..dc68875ee0e5 100644
--- a/clients/client-proton/src/pagination/ListEnvironmentTemplatesPaginator.ts
+++ b/clients/client-proton/src/pagination/ListEnvironmentTemplatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEnvironmentTemplates(
       throw new Error("Invalid client, expected Proton | ProtonClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-proton/src/pagination/ListEnvironmentsPaginator.ts b/clients/client-proton/src/pagination/ListEnvironmentsPaginator.ts
index 537dcb4de1ce..bd84ab8ce3e5 100644
--- a/clients/client-proton/src/pagination/ListEnvironmentsPaginator.ts
+++ b/clients/client-proton/src/pagination/ListEnvironmentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEnvironments(
       throw new Error("Invalid client, expected Proton | ProtonClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-proton/src/pagination/ListRepositoriesPaginator.ts b/clients/client-proton/src/pagination/ListRepositoriesPaginator.ts
index 2eaa1c14163e..ce8a08c7fd39 100644
--- a/clients/client-proton/src/pagination/ListRepositoriesPaginator.ts
+++ b/clients/client-proton/src/pagination/ListRepositoriesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRepositories(
       throw new Error("Invalid client, expected Proton | ProtonClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-proton/src/pagination/ListRepositorySyncDefinitionsPaginator.ts b/clients/client-proton/src/pagination/ListRepositorySyncDefinitionsPaginator.ts
index e12a8697cae4..6d91d8ffb872 100644
--- a/clients/client-proton/src/pagination/ListRepositorySyncDefinitionsPaginator.ts
+++ b/clients/client-proton/src/pagination/ListRepositorySyncDefinitionsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListRepositorySyncDefinitions(
       throw new Error("Invalid client, expected Proton | ProtonClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-proton/src/pagination/ListServiceInstanceOutputsPaginator.ts b/clients/client-proton/src/pagination/ListServiceInstanceOutputsPaginator.ts
index 8e9bfe44d3d6..dc433f17506a 100644
--- a/clients/client-proton/src/pagination/ListServiceInstanceOutputsPaginator.ts
+++ b/clients/client-proton/src/pagination/ListServiceInstanceOutputsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListServiceInstanceOutputs(
       throw new Error("Invalid client, expected Proton | ProtonClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-proton/src/pagination/ListServiceInstanceProvisionedResourcesPaginator.ts b/clients/client-proton/src/pagination/ListServiceInstanceProvisionedResourcesPaginator.ts
index 4fb00aa8487b..7ab4bab0e043 100644
--- a/clients/client-proton/src/pagination/ListServiceInstanceProvisionedResourcesPaginator.ts
+++ b/clients/client-proton/src/pagination/ListServiceInstanceProvisionedResourcesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListServiceInstanceProvisionedResources(
       throw new Error("Invalid client, expected Proton | ProtonClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-proton/src/pagination/ListServiceInstancesPaginator.ts b/clients/client-proton/src/pagination/ListServiceInstancesPaginator.ts
index 192a2438bb4e..3a7fca182d97 100644
--- a/clients/client-proton/src/pagination/ListServiceInstancesPaginator.ts
+++ b/clients/client-proton/src/pagination/ListServiceInstancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListServiceInstances(
       throw new Error("Invalid client, expected Proton | ProtonClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-proton/src/pagination/ListServicePipelineOutputsPaginator.ts b/clients/client-proton/src/pagination/ListServicePipelineOutputsPaginator.ts
index 08a3f73c3711..19c8dfe00415 100644
--- a/clients/client-proton/src/pagination/ListServicePipelineOutputsPaginator.ts
+++ b/clients/client-proton/src/pagination/ListServicePipelineOutputsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListServicePipelineOutputs(
       throw new Error("Invalid client, expected Proton | ProtonClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-proton/src/pagination/ListServicePipelineProvisionedResourcesPaginator.ts b/clients/client-proton/src/pagination/ListServicePipelineProvisionedResourcesPaginator.ts
index 901e969e3835..b72f30548848 100644
--- a/clients/client-proton/src/pagination/ListServicePipelineProvisionedResourcesPaginator.ts
+++ b/clients/client-proton/src/pagination/ListServicePipelineProvisionedResourcesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListServicePipelineProvisionedResources(
       throw new Error("Invalid client, expected Proton | ProtonClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-proton/src/pagination/ListServiceTemplateVersionsPaginator.ts b/clients/client-proton/src/pagination/ListServiceTemplateVersionsPaginator.ts
index 9eb414874692..d806bbee512d 100644
--- a/clients/client-proton/src/pagination/ListServiceTemplateVersionsPaginator.ts
+++ b/clients/client-proton/src/pagination/ListServiceTemplateVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListServiceTemplateVersions(
       throw new Error("Invalid client, expected Proton | ProtonClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-proton/src/pagination/ListServiceTemplatesPaginator.ts b/clients/client-proton/src/pagination/ListServiceTemplatesPaginator.ts
index 2f5fc822f300..b70f9a0bc3af 100644
--- a/clients/client-proton/src/pagination/ListServiceTemplatesPaginator.ts
+++ b/clients/client-proton/src/pagination/ListServiceTemplatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListServiceTemplates(
       throw new Error("Invalid client, expected Proton | ProtonClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-proton/src/pagination/ListServicesPaginator.ts b/clients/client-proton/src/pagination/ListServicesPaginator.ts
index eb5c4059cbcc..809f824ccc58 100644
--- a/clients/client-proton/src/pagination/ListServicesPaginator.ts
+++ b/clients/client-proton/src/pagination/ListServicesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListServices(
       throw new Error("Invalid client, expected Proton | ProtonClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-proton/src/pagination/ListTagsForResourcePaginator.ts b/clients/client-proton/src/pagination/ListTagsForResourcePaginator.ts
index 4fde7fc5b97b..e92120107487 100644
--- a/clients/client-proton/src/pagination/ListTagsForResourcePaginator.ts
+++ b/clients/client-proton/src/pagination/ListTagsForResourcePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTagsForResource(
       throw new Error("Invalid client, expected Proton | ProtonClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-qldb/src/pagination/ListJournalKinesisStreamsForLedgerPaginator.ts b/clients/client-qldb/src/pagination/ListJournalKinesisStreamsForLedgerPaginator.ts
index 75ae805f80b7..682d8037ede1 100644
--- a/clients/client-qldb/src/pagination/ListJournalKinesisStreamsForLedgerPaginator.ts
+++ b/clients/client-qldb/src/pagination/ListJournalKinesisStreamsForLedgerPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListJournalKinesisStreamsForLedger(
       throw new Error("Invalid client, expected QLDB | QLDBClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-qldb/src/pagination/ListJournalS3ExportsForLedgerPaginator.ts b/clients/client-qldb/src/pagination/ListJournalS3ExportsForLedgerPaginator.ts
index b36e87e9e51d..eab5534b0d12 100644
--- a/clients/client-qldb/src/pagination/ListJournalS3ExportsForLedgerPaginator.ts
+++ b/clients/client-qldb/src/pagination/ListJournalS3ExportsForLedgerPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListJournalS3ExportsForLedger(
       throw new Error("Invalid client, expected QLDB | QLDBClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-qldb/src/pagination/ListJournalS3ExportsPaginator.ts b/clients/client-qldb/src/pagination/ListJournalS3ExportsPaginator.ts
index e392214e75e3..6b0925197a38 100644
--- a/clients/client-qldb/src/pagination/ListJournalS3ExportsPaginator.ts
+++ b/clients/client-qldb/src/pagination/ListJournalS3ExportsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListJournalS3Exports(
       throw new Error("Invalid client, expected QLDB | QLDBClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-qldb/src/pagination/ListLedgersPaginator.ts b/clients/client-qldb/src/pagination/ListLedgersPaginator.ts
index 2e80fb56cf1d..c9ca198b2042 100644
--- a/clients/client-qldb/src/pagination/ListLedgersPaginator.ts
+++ b/clients/client-qldb/src/pagination/ListLedgersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListLedgers(
       throw new Error("Invalid client, expected QLDB | QLDBClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-quicksight/src/pagination/ListAnalysesPaginator.ts b/clients/client-quicksight/src/pagination/ListAnalysesPaginator.ts
index c7fd77818407..fdfc15d78097 100644
--- a/clients/client-quicksight/src/pagination/ListAnalysesPaginator.ts
+++ b/clients/client-quicksight/src/pagination/ListAnalysesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAnalyses(
       throw new Error("Invalid client, expected QuickSight | QuickSightClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-quicksight/src/pagination/ListDashboardVersionsPaginator.ts b/clients/client-quicksight/src/pagination/ListDashboardVersionsPaginator.ts
index c8512bf5abd9..915094e1c637 100644
--- a/clients/client-quicksight/src/pagination/ListDashboardVersionsPaginator.ts
+++ b/clients/client-quicksight/src/pagination/ListDashboardVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDashboardVersions(
       throw new Error("Invalid client, expected QuickSight | QuickSightClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-quicksight/src/pagination/ListDashboardsPaginator.ts b/clients/client-quicksight/src/pagination/ListDashboardsPaginator.ts
index 72d51a7a3421..052a7ef9bbc4 100644
--- a/clients/client-quicksight/src/pagination/ListDashboardsPaginator.ts
+++ b/clients/client-quicksight/src/pagination/ListDashboardsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDashboards(
       throw new Error("Invalid client, expected QuickSight | QuickSightClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-quicksight/src/pagination/ListDataSetsPaginator.ts b/clients/client-quicksight/src/pagination/ListDataSetsPaginator.ts
index d37fb2e425af..99d229fe9133 100644
--- a/clients/client-quicksight/src/pagination/ListDataSetsPaginator.ts
+++ b/clients/client-quicksight/src/pagination/ListDataSetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDataSets(
       throw new Error("Invalid client, expected QuickSight | QuickSightClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-quicksight/src/pagination/ListDataSourcesPaginator.ts b/clients/client-quicksight/src/pagination/ListDataSourcesPaginator.ts
index 50e205f9158e..21d7e61798e1 100644
--- a/clients/client-quicksight/src/pagination/ListDataSourcesPaginator.ts
+++ b/clients/client-quicksight/src/pagination/ListDataSourcesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDataSources(
       throw new Error("Invalid client, expected QuickSight | QuickSightClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-quicksight/src/pagination/ListIngestionsPaginator.ts b/clients/client-quicksight/src/pagination/ListIngestionsPaginator.ts
index 257a5cf2738b..35f0b2f5507e 100644
--- a/clients/client-quicksight/src/pagination/ListIngestionsPaginator.ts
+++ b/clients/client-quicksight/src/pagination/ListIngestionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListIngestions(
       throw new Error("Invalid client, expected QuickSight | QuickSightClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-quicksight/src/pagination/ListNamespacesPaginator.ts b/clients/client-quicksight/src/pagination/ListNamespacesPaginator.ts
index 5540363a531a..7bacf1879119 100644
--- a/clients/client-quicksight/src/pagination/ListNamespacesPaginator.ts
+++ b/clients/client-quicksight/src/pagination/ListNamespacesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListNamespaces(
       throw new Error("Invalid client, expected QuickSight | QuickSightClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-quicksight/src/pagination/ListTemplateAliasesPaginator.ts b/clients/client-quicksight/src/pagination/ListTemplateAliasesPaginator.ts
index 92e21a63d616..1129ac830ff5 100644
--- a/clients/client-quicksight/src/pagination/ListTemplateAliasesPaginator.ts
+++ b/clients/client-quicksight/src/pagination/ListTemplateAliasesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTemplateAliases(
       throw new Error("Invalid client, expected QuickSight | QuickSightClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-quicksight/src/pagination/ListTemplateVersionsPaginator.ts b/clients/client-quicksight/src/pagination/ListTemplateVersionsPaginator.ts
index 6921dbd9c22a..23f21ee2a4d4 100644
--- a/clients/client-quicksight/src/pagination/ListTemplateVersionsPaginator.ts
+++ b/clients/client-quicksight/src/pagination/ListTemplateVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTemplateVersions(
       throw new Error("Invalid client, expected QuickSight | QuickSightClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-quicksight/src/pagination/ListTemplatesPaginator.ts b/clients/client-quicksight/src/pagination/ListTemplatesPaginator.ts
index b15b83174975..9eb4dc9a2061 100644
--- a/clients/client-quicksight/src/pagination/ListTemplatesPaginator.ts
+++ b/clients/client-quicksight/src/pagination/ListTemplatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTemplates(
       throw new Error("Invalid client, expected QuickSight | QuickSightClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-quicksight/src/pagination/ListThemeVersionsPaginator.ts b/clients/client-quicksight/src/pagination/ListThemeVersionsPaginator.ts
index d45e0b1e36f3..fda07ef73e41 100644
--- a/clients/client-quicksight/src/pagination/ListThemeVersionsPaginator.ts
+++ b/clients/client-quicksight/src/pagination/ListThemeVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListThemeVersions(
       throw new Error("Invalid client, expected QuickSight | QuickSightClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-quicksight/src/pagination/ListThemesPaginator.ts b/clients/client-quicksight/src/pagination/ListThemesPaginator.ts
index ad898a322a76..57170b7043f9 100644
--- a/clients/client-quicksight/src/pagination/ListThemesPaginator.ts
+++ b/clients/client-quicksight/src/pagination/ListThemesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListThemes(
       throw new Error("Invalid client, expected QuickSight | QuickSightClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-quicksight/src/pagination/SearchAnalysesPaginator.ts b/clients/client-quicksight/src/pagination/SearchAnalysesPaginator.ts
index 0e25a372dd3f..5df51f23d8f4 100644
--- a/clients/client-quicksight/src/pagination/SearchAnalysesPaginator.ts
+++ b/clients/client-quicksight/src/pagination/SearchAnalysesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchAnalyses(
       throw new Error("Invalid client, expected QuickSight | QuickSightClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-quicksight/src/pagination/SearchDashboardsPaginator.ts b/clients/client-quicksight/src/pagination/SearchDashboardsPaginator.ts
index a0c6510f6c42..b0e934ce9dc4 100644
--- a/clients/client-quicksight/src/pagination/SearchDashboardsPaginator.ts
+++ b/clients/client-quicksight/src/pagination/SearchDashboardsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchDashboards(
       throw new Error("Invalid client, expected QuickSight | QuickSightClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ram/src/pagination/GetResourcePoliciesPaginator.ts b/clients/client-ram/src/pagination/GetResourcePoliciesPaginator.ts
index 4f30ddf1c639..cef771697632 100644
--- a/clients/client-ram/src/pagination/GetResourcePoliciesPaginator.ts
+++ b/clients/client-ram/src/pagination/GetResourcePoliciesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetResourcePolicies(
       throw new Error("Invalid client, expected RAM | RAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ram/src/pagination/GetResourceShareAssociationsPaginator.ts b/clients/client-ram/src/pagination/GetResourceShareAssociationsPaginator.ts
index 40b9302c92c7..5ac13879eae2 100644
--- a/clients/client-ram/src/pagination/GetResourceShareAssociationsPaginator.ts
+++ b/clients/client-ram/src/pagination/GetResourceShareAssociationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetResourceShareAssociations(
       throw new Error("Invalid client, expected RAM | RAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ram/src/pagination/GetResourceShareInvitationsPaginator.ts b/clients/client-ram/src/pagination/GetResourceShareInvitationsPaginator.ts
index 53fb58077205..742f10d81628 100644
--- a/clients/client-ram/src/pagination/GetResourceShareInvitationsPaginator.ts
+++ b/clients/client-ram/src/pagination/GetResourceShareInvitationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetResourceShareInvitations(
       throw new Error("Invalid client, expected RAM | RAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ram/src/pagination/GetResourceSharesPaginator.ts b/clients/client-ram/src/pagination/GetResourceSharesPaginator.ts
index 3e5d53ceb76b..e37240edc571 100644
--- a/clients/client-ram/src/pagination/GetResourceSharesPaginator.ts
+++ b/clients/client-ram/src/pagination/GetResourceSharesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetResourceShares(
       throw new Error("Invalid client, expected RAM | RAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ram/src/pagination/ListPendingInvitationResourcesPaginator.ts b/clients/client-ram/src/pagination/ListPendingInvitationResourcesPaginator.ts
index 8c50c4c39adc..c7344fda0fef 100644
--- a/clients/client-ram/src/pagination/ListPendingInvitationResourcesPaginator.ts
+++ b/clients/client-ram/src/pagination/ListPendingInvitationResourcesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPendingInvitationResources(
       throw new Error("Invalid client, expected RAM | RAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ram/src/pagination/ListPermissionVersionsPaginator.ts b/clients/client-ram/src/pagination/ListPermissionVersionsPaginator.ts
index d3a22a6d2dd5..64ed6605eee4 100644
--- a/clients/client-ram/src/pagination/ListPermissionVersionsPaginator.ts
+++ b/clients/client-ram/src/pagination/ListPermissionVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPermissionVersions(
       throw new Error("Invalid client, expected RAM | RAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ram/src/pagination/ListPermissionsPaginator.ts b/clients/client-ram/src/pagination/ListPermissionsPaginator.ts
index fd6af83c801e..d88c90cd67ce 100644
--- a/clients/client-ram/src/pagination/ListPermissionsPaginator.ts
+++ b/clients/client-ram/src/pagination/ListPermissionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPermissions(
       throw new Error("Invalid client, expected RAM | RAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ram/src/pagination/ListPrincipalsPaginator.ts b/clients/client-ram/src/pagination/ListPrincipalsPaginator.ts
index b19932e545b1..7c4a79925ba5 100644
--- a/clients/client-ram/src/pagination/ListPrincipalsPaginator.ts
+++ b/clients/client-ram/src/pagination/ListPrincipalsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPrincipals(
       throw new Error("Invalid client, expected RAM | RAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ram/src/pagination/ListResourceSharePermissionsPaginator.ts b/clients/client-ram/src/pagination/ListResourceSharePermissionsPaginator.ts
index 1a6b0e1b97d6..f3762aa16ae5 100644
--- a/clients/client-ram/src/pagination/ListResourceSharePermissionsPaginator.ts
+++ b/clients/client-ram/src/pagination/ListResourceSharePermissionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListResourceSharePermissions(
       throw new Error("Invalid client, expected RAM | RAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ram/src/pagination/ListResourceTypesPaginator.ts b/clients/client-ram/src/pagination/ListResourceTypesPaginator.ts
index f3a4b96cc017..7b0a9f655a98 100644
--- a/clients/client-ram/src/pagination/ListResourceTypesPaginator.ts
+++ b/clients/client-ram/src/pagination/ListResourceTypesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListResourceTypes(
       throw new Error("Invalid client, expected RAM | RAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ram/src/pagination/ListResourcesPaginator.ts b/clients/client-ram/src/pagination/ListResourcesPaginator.ts
index 6c2107bd62cd..70b4277274cf 100644
--- a/clients/client-ram/src/pagination/ListResourcesPaginator.ts
+++ b/clients/client-ram/src/pagination/ListResourcesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListResources(
       throw new Error("Invalid client, expected RAM | RAMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rbin/src/pagination/ListRulesPaginator.ts b/clients/client-rbin/src/pagination/ListRulesPaginator.ts
index f60c81670454..b9805588524f 100644
--- a/clients/client-rbin/src/pagination/ListRulesPaginator.ts
+++ b/clients/client-rbin/src/pagination/ListRulesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListRules(
       throw new Error("Invalid client, expected Rbin | RbinClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeCertificatesPaginator.ts b/clients/client-rds/src/pagination/DescribeCertificatesPaginator.ts
index 0179aceeb602..ebec68b001dc 100644
--- a/clients/client-rds/src/pagination/DescribeCertificatesPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeCertificatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeCertificates(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeDBClusterBacktracksPaginator.ts b/clients/client-rds/src/pagination/DescribeDBClusterBacktracksPaginator.ts
index 22c98c1bc85d..323225656852 100644
--- a/clients/client-rds/src/pagination/DescribeDBClusterBacktracksPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeDBClusterBacktracksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBClusterBacktracks(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeDBClusterEndpointsPaginator.ts b/clients/client-rds/src/pagination/DescribeDBClusterEndpointsPaginator.ts
index 72da8d5d0cdb..25ae4c9b7b2d 100644
--- a/clients/client-rds/src/pagination/DescribeDBClusterEndpointsPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeDBClusterEndpointsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBClusterEndpoints(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeDBClusterParameterGroupsPaginator.ts b/clients/client-rds/src/pagination/DescribeDBClusterParameterGroupsPaginator.ts
index d114dc5d8251..68a53717e771 100644
--- a/clients/client-rds/src/pagination/DescribeDBClusterParameterGroupsPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeDBClusterParameterGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBClusterParameterGroups(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeDBClusterParametersPaginator.ts b/clients/client-rds/src/pagination/DescribeDBClusterParametersPaginator.ts
index 18a0a456f461..956fc1941b64 100644
--- a/clients/client-rds/src/pagination/DescribeDBClusterParametersPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeDBClusterParametersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBClusterParameters(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeDBClusterSnapshotsPaginator.ts b/clients/client-rds/src/pagination/DescribeDBClusterSnapshotsPaginator.ts
index dfd945cc22a3..2b3c87568546 100644
--- a/clients/client-rds/src/pagination/DescribeDBClusterSnapshotsPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeDBClusterSnapshotsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBClusterSnapshots(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeDBClustersPaginator.ts b/clients/client-rds/src/pagination/DescribeDBClustersPaginator.ts
index 633b4797186d..f2793a5d9b2a 100644
--- a/clients/client-rds/src/pagination/DescribeDBClustersPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeDBClustersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBClusters(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeDBEngineVersionsPaginator.ts b/clients/client-rds/src/pagination/DescribeDBEngineVersionsPaginator.ts
index 629a9257a836..533c9f818b57 100644
--- a/clients/client-rds/src/pagination/DescribeDBEngineVersionsPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeDBEngineVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBEngineVersions(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeDBInstanceAutomatedBackupsPaginator.ts b/clients/client-rds/src/pagination/DescribeDBInstanceAutomatedBackupsPaginator.ts
index fb0414f4e16d..38548f655a53 100644
--- a/clients/client-rds/src/pagination/DescribeDBInstanceAutomatedBackupsPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeDBInstanceAutomatedBackupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBInstanceAutomatedBackups(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeDBInstancesPaginator.ts b/clients/client-rds/src/pagination/DescribeDBInstancesPaginator.ts
index 1bc90b81e10d..7aefe24d0340 100644
--- a/clients/client-rds/src/pagination/DescribeDBInstancesPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeDBInstancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBInstances(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeDBLogFilesPaginator.ts b/clients/client-rds/src/pagination/DescribeDBLogFilesPaginator.ts
index eb03ff518a8f..41c4ba6653df 100644
--- a/clients/client-rds/src/pagination/DescribeDBLogFilesPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeDBLogFilesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBLogFiles(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeDBParameterGroupsPaginator.ts b/clients/client-rds/src/pagination/DescribeDBParameterGroupsPaginator.ts
index b51498916f9c..7974b882a6f1 100644
--- a/clients/client-rds/src/pagination/DescribeDBParameterGroupsPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeDBParameterGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBParameterGroups(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeDBParametersPaginator.ts b/clients/client-rds/src/pagination/DescribeDBParametersPaginator.ts
index 2f290dc69f11..e3c8eefe1da5 100644
--- a/clients/client-rds/src/pagination/DescribeDBParametersPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeDBParametersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBParameters(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeDBProxiesPaginator.ts b/clients/client-rds/src/pagination/DescribeDBProxiesPaginator.ts
index f7e910bc48dc..d833f288f5ad 100644
--- a/clients/client-rds/src/pagination/DescribeDBProxiesPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeDBProxiesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBProxies(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeDBProxyEndpointsPaginator.ts b/clients/client-rds/src/pagination/DescribeDBProxyEndpointsPaginator.ts
index f0dcbb02e93b..d6d2fb2dabb4 100644
--- a/clients/client-rds/src/pagination/DescribeDBProxyEndpointsPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeDBProxyEndpointsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBProxyEndpoints(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeDBProxyTargetGroupsPaginator.ts b/clients/client-rds/src/pagination/DescribeDBProxyTargetGroupsPaginator.ts
index 63c0a6ea6b2d..e24e9b893dc8 100644
--- a/clients/client-rds/src/pagination/DescribeDBProxyTargetGroupsPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeDBProxyTargetGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBProxyTargetGroups(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeDBProxyTargetsPaginator.ts b/clients/client-rds/src/pagination/DescribeDBProxyTargetsPaginator.ts
index dfcdb071d06d..c039a6b03c50 100644
--- a/clients/client-rds/src/pagination/DescribeDBProxyTargetsPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeDBProxyTargetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBProxyTargets(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeDBSecurityGroupsPaginator.ts b/clients/client-rds/src/pagination/DescribeDBSecurityGroupsPaginator.ts
index 65fad9b0d7ba..bad1a089a2f4 100644
--- a/clients/client-rds/src/pagination/DescribeDBSecurityGroupsPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeDBSecurityGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBSecurityGroups(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeDBSnapshotsPaginator.ts b/clients/client-rds/src/pagination/DescribeDBSnapshotsPaginator.ts
index 51cda085560e..da349697cf0d 100644
--- a/clients/client-rds/src/pagination/DescribeDBSnapshotsPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeDBSnapshotsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBSnapshots(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeDBSubnetGroupsPaginator.ts b/clients/client-rds/src/pagination/DescribeDBSubnetGroupsPaginator.ts
index 5348391f5c68..495ad01feab1 100644
--- a/clients/client-rds/src/pagination/DescribeDBSubnetGroupsPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeDBSubnetGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDBSubnetGroups(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeEngineDefaultParametersPaginator.ts b/clients/client-rds/src/pagination/DescribeEngineDefaultParametersPaginator.ts
index ea44fb1ab4d2..7736546ae3c3 100644
--- a/clients/client-rds/src/pagination/DescribeEngineDefaultParametersPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeEngineDefaultParametersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEngineDefaultParameters(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.EngineDefaults!.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeEventSubscriptionsPaginator.ts b/clients/client-rds/src/pagination/DescribeEventSubscriptionsPaginator.ts
index 3820939ee650..f0903fea6665 100644
--- a/clients/client-rds/src/pagination/DescribeEventSubscriptionsPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeEventSubscriptionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEventSubscriptions(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeEventsPaginator.ts b/clients/client-rds/src/pagination/DescribeEventsPaginator.ts
index 4b2e482512ba..f580107f0a23 100644
--- a/clients/client-rds/src/pagination/DescribeEventsPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeEventsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEvents(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeExportTasksPaginator.ts b/clients/client-rds/src/pagination/DescribeExportTasksPaginator.ts
index 08fd1ed0639d..9f13cd76ac42 100644
--- a/clients/client-rds/src/pagination/DescribeExportTasksPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeExportTasksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeExportTasks(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeGlobalClustersPaginator.ts b/clients/client-rds/src/pagination/DescribeGlobalClustersPaginator.ts
index 2496bdfc06a8..19fc98d4a1ab 100644
--- a/clients/client-rds/src/pagination/DescribeGlobalClustersPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeGlobalClustersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeGlobalClusters(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeOptionGroupOptionsPaginator.ts b/clients/client-rds/src/pagination/DescribeOptionGroupOptionsPaginator.ts
index a42d75a3dd05..fa08d8934ec6 100644
--- a/clients/client-rds/src/pagination/DescribeOptionGroupOptionsPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeOptionGroupOptionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeOptionGroupOptions(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeOptionGroupsPaginator.ts b/clients/client-rds/src/pagination/DescribeOptionGroupsPaginator.ts
index 613c8f150bff..4ac4a8964a0b 100644
--- a/clients/client-rds/src/pagination/DescribeOptionGroupsPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeOptionGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeOptionGroups(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeOrderableDBInstanceOptionsPaginator.ts b/clients/client-rds/src/pagination/DescribeOrderableDBInstanceOptionsPaginator.ts
index e48bb9a888f4..43af1635a8eb 100644
--- a/clients/client-rds/src/pagination/DescribeOrderableDBInstanceOptionsPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeOrderableDBInstanceOptionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeOrderableDBInstanceOptions(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribePendingMaintenanceActionsPaginator.ts b/clients/client-rds/src/pagination/DescribePendingMaintenanceActionsPaginator.ts
index 90dd3da82942..ff12b8b19fbe 100644
--- a/clients/client-rds/src/pagination/DescribePendingMaintenanceActionsPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribePendingMaintenanceActionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribePendingMaintenanceActions(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeReservedDBInstancesOfferingsPaginator.ts b/clients/client-rds/src/pagination/DescribeReservedDBInstancesOfferingsPaginator.ts
index 0911a13e1f86..74a2a15ddb90 100644
--- a/clients/client-rds/src/pagination/DescribeReservedDBInstancesOfferingsPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeReservedDBInstancesOfferingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeReservedDBInstancesOfferings(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeReservedDBInstancesPaginator.ts b/clients/client-rds/src/pagination/DescribeReservedDBInstancesPaginator.ts
index 3b23c8b3c21c..268bdaba474d 100644
--- a/clients/client-rds/src/pagination/DescribeReservedDBInstancesPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeReservedDBInstancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeReservedDBInstances(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DescribeSourceRegionsPaginator.ts b/clients/client-rds/src/pagination/DescribeSourceRegionsPaginator.ts
index c4600c1b5da7..5bab4d3e9684 100644
--- a/clients/client-rds/src/pagination/DescribeSourceRegionsPaginator.ts
+++ b/clients/client-rds/src/pagination/DescribeSourceRegionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeSourceRegions(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rds/src/pagination/DownloadDBLogFilePortionPaginator.ts b/clients/client-rds/src/pagination/DownloadDBLogFilePortionPaginator.ts
index c6ba83bf043e..aa99dffecd6b 100644
--- a/clients/client-rds/src/pagination/DownloadDBLogFilePortionPaginator.ts
+++ b/clients/client-rds/src/pagination/DownloadDBLogFilePortionPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDownloadDBLogFilePortion(
       throw new Error("Invalid client, expected RDS | RDSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift-data/src/pagination/DescribeTablePaginator.ts b/clients/client-redshift-data/src/pagination/DescribeTablePaginator.ts
index 00f141f5688c..c830f907e9bf 100644
--- a/clients/client-redshift-data/src/pagination/DescribeTablePaginator.ts
+++ b/clients/client-redshift-data/src/pagination/DescribeTablePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeTable(
       throw new Error("Invalid client, expected RedshiftData | RedshiftDataClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift-data/src/pagination/GetStatementResultPaginator.ts b/clients/client-redshift-data/src/pagination/GetStatementResultPaginator.ts
index 72636e40083f..fe9db706dd13 100644
--- a/clients/client-redshift-data/src/pagination/GetStatementResultPaginator.ts
+++ b/clients/client-redshift-data/src/pagination/GetStatementResultPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateGetStatementResult(
       throw new Error("Invalid client, expected RedshiftData | RedshiftDataClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift-data/src/pagination/ListDatabasesPaginator.ts b/clients/client-redshift-data/src/pagination/ListDatabasesPaginator.ts
index 463248e6d853..c01a6729d98c 100644
--- a/clients/client-redshift-data/src/pagination/ListDatabasesPaginator.ts
+++ b/clients/client-redshift-data/src/pagination/ListDatabasesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDatabases(
       throw new Error("Invalid client, expected RedshiftData | RedshiftDataClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift-data/src/pagination/ListSchemasPaginator.ts b/clients/client-redshift-data/src/pagination/ListSchemasPaginator.ts
index 21472f8dd0f4..3346fc49fd23 100644
--- a/clients/client-redshift-data/src/pagination/ListSchemasPaginator.ts
+++ b/clients/client-redshift-data/src/pagination/ListSchemasPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListSchemas(
       throw new Error("Invalid client, expected RedshiftData | RedshiftDataClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift-data/src/pagination/ListStatementsPaginator.ts b/clients/client-redshift-data/src/pagination/ListStatementsPaginator.ts
index 2fc5649e9d6d..1847672e61cf 100644
--- a/clients/client-redshift-data/src/pagination/ListStatementsPaginator.ts
+++ b/clients/client-redshift-data/src/pagination/ListStatementsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListStatements(
       throw new Error("Invalid client, expected RedshiftData | RedshiftDataClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift-data/src/pagination/ListTablesPaginator.ts b/clients/client-redshift-data/src/pagination/ListTablesPaginator.ts
index 03f89103cdb1..75d4924ae0cd 100644
--- a/clients/client-redshift-data/src/pagination/ListTablesPaginator.ts
+++ b/clients/client-redshift-data/src/pagination/ListTablesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListTables(
       throw new Error("Invalid client, expected RedshiftData | RedshiftDataClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeClusterDbRevisionsPaginator.ts b/clients/client-redshift/src/pagination/DescribeClusterDbRevisionsPaginator.ts
index 6b7f94f59d24..99bc242bb757 100644
--- a/clients/client-redshift/src/pagination/DescribeClusterDbRevisionsPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeClusterDbRevisionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeClusterDbRevisions(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeClusterParameterGroupsPaginator.ts b/clients/client-redshift/src/pagination/DescribeClusterParameterGroupsPaginator.ts
index eb761cc138fe..b539a65c083d 100644
--- a/clients/client-redshift/src/pagination/DescribeClusterParameterGroupsPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeClusterParameterGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeClusterParameterGroups(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeClusterParametersPaginator.ts b/clients/client-redshift/src/pagination/DescribeClusterParametersPaginator.ts
index 7dd0de3e85a7..274c8686e4e2 100644
--- a/clients/client-redshift/src/pagination/DescribeClusterParametersPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeClusterParametersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeClusterParameters(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeClusterSecurityGroupsPaginator.ts b/clients/client-redshift/src/pagination/DescribeClusterSecurityGroupsPaginator.ts
index af9337d0a513..771a9beb5377 100644
--- a/clients/client-redshift/src/pagination/DescribeClusterSecurityGroupsPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeClusterSecurityGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeClusterSecurityGroups(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeClusterSnapshotsPaginator.ts b/clients/client-redshift/src/pagination/DescribeClusterSnapshotsPaginator.ts
index 9e4edca5fe5f..f27588bf72d1 100644
--- a/clients/client-redshift/src/pagination/DescribeClusterSnapshotsPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeClusterSnapshotsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeClusterSnapshots(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeClusterSubnetGroupsPaginator.ts b/clients/client-redshift/src/pagination/DescribeClusterSubnetGroupsPaginator.ts
index 4350a13aa154..6548252bec27 100644
--- a/clients/client-redshift/src/pagination/DescribeClusterSubnetGroupsPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeClusterSubnetGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeClusterSubnetGroups(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeClusterTracksPaginator.ts b/clients/client-redshift/src/pagination/DescribeClusterTracksPaginator.ts
index 0fe0fe8e7b8f..ee0067886acd 100644
--- a/clients/client-redshift/src/pagination/DescribeClusterTracksPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeClusterTracksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeClusterTracks(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeClusterVersionsPaginator.ts b/clients/client-redshift/src/pagination/DescribeClusterVersionsPaginator.ts
index d527a1963aea..7bc70683a0ac 100644
--- a/clients/client-redshift/src/pagination/DescribeClusterVersionsPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeClusterVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeClusterVersions(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeClustersPaginator.ts b/clients/client-redshift/src/pagination/DescribeClustersPaginator.ts
index 13f6bd77b2de..611a391940c1 100644
--- a/clients/client-redshift/src/pagination/DescribeClustersPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeClustersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeClusters(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeDataSharesForConsumerPaginator.ts b/clients/client-redshift/src/pagination/DescribeDataSharesForConsumerPaginator.ts
index 55251b3a9522..74dc60491484 100644
--- a/clients/client-redshift/src/pagination/DescribeDataSharesForConsumerPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeDataSharesForConsumerPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDataSharesForConsumer(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeDataSharesForProducerPaginator.ts b/clients/client-redshift/src/pagination/DescribeDataSharesForProducerPaginator.ts
index 9f288c076c47..59fb59a48236 100644
--- a/clients/client-redshift/src/pagination/DescribeDataSharesForProducerPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeDataSharesForProducerPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDataSharesForProducer(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeDataSharesPaginator.ts b/clients/client-redshift/src/pagination/DescribeDataSharesPaginator.ts
index 8a04db182cb6..2f1a1f1fdfbc 100644
--- a/clients/client-redshift/src/pagination/DescribeDataSharesPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeDataSharesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDataShares(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeDefaultClusterParametersPaginator.ts b/clients/client-redshift/src/pagination/DescribeDefaultClusterParametersPaginator.ts
index 77c0956b2b1d..455c1da9629d 100644
--- a/clients/client-redshift/src/pagination/DescribeDefaultClusterParametersPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeDefaultClusterParametersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDefaultClusterParameters(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.DefaultClusterParameters!.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeEndpointAccessPaginator.ts b/clients/client-redshift/src/pagination/DescribeEndpointAccessPaginator.ts
index 225a36372185..3ba91218dfea 100644
--- a/clients/client-redshift/src/pagination/DescribeEndpointAccessPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeEndpointAccessPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEndpointAccess(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeEndpointAuthorizationPaginator.ts b/clients/client-redshift/src/pagination/DescribeEndpointAuthorizationPaginator.ts
index 5415d6a91e0c..a02fc57efcd4 100644
--- a/clients/client-redshift/src/pagination/DescribeEndpointAuthorizationPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeEndpointAuthorizationPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEndpointAuthorization(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeEventSubscriptionsPaginator.ts b/clients/client-redshift/src/pagination/DescribeEventSubscriptionsPaginator.ts
index 4dbaef23d514..346b9d50d528 100644
--- a/clients/client-redshift/src/pagination/DescribeEventSubscriptionsPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeEventSubscriptionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEventSubscriptions(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeEventsPaginator.ts b/clients/client-redshift/src/pagination/DescribeEventsPaginator.ts
index a6b8d0d51f44..0452420a6efd 100644
--- a/clients/client-redshift/src/pagination/DescribeEventsPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeEventsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEvents(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeHsmClientCertificatesPaginator.ts b/clients/client-redshift/src/pagination/DescribeHsmClientCertificatesPaginator.ts
index 0e15b8a2ed82..6c5b26a2ab7b 100644
--- a/clients/client-redshift/src/pagination/DescribeHsmClientCertificatesPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeHsmClientCertificatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeHsmClientCertificates(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeHsmConfigurationsPaginator.ts b/clients/client-redshift/src/pagination/DescribeHsmConfigurationsPaginator.ts
index 6ce903c3427c..64400c511eb2 100644
--- a/clients/client-redshift/src/pagination/DescribeHsmConfigurationsPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeHsmConfigurationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeHsmConfigurations(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeNodeConfigurationOptionsPaginator.ts b/clients/client-redshift/src/pagination/DescribeNodeConfigurationOptionsPaginator.ts
index 5628e619405e..cd8caee403a2 100644
--- a/clients/client-redshift/src/pagination/DescribeNodeConfigurationOptionsPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeNodeConfigurationOptionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeNodeConfigurationOptions(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeOrderableClusterOptionsPaginator.ts b/clients/client-redshift/src/pagination/DescribeOrderableClusterOptionsPaginator.ts
index fae0a3552200..d056a4974d82 100644
--- a/clients/client-redshift/src/pagination/DescribeOrderableClusterOptionsPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeOrderableClusterOptionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeOrderableClusterOptions(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeReservedNodeExchangeStatusPaginator.ts b/clients/client-redshift/src/pagination/DescribeReservedNodeExchangeStatusPaginator.ts
index 368b6a653bef..7d130af72f88 100644
--- a/clients/client-redshift/src/pagination/DescribeReservedNodeExchangeStatusPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeReservedNodeExchangeStatusPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeReservedNodeExchangeStatus(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeReservedNodeOfferingsPaginator.ts b/clients/client-redshift/src/pagination/DescribeReservedNodeOfferingsPaginator.ts
index 81f6058bf78f..5660ffc96970 100644
--- a/clients/client-redshift/src/pagination/DescribeReservedNodeOfferingsPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeReservedNodeOfferingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeReservedNodeOfferings(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeReservedNodesPaginator.ts b/clients/client-redshift/src/pagination/DescribeReservedNodesPaginator.ts
index b8301d1caad8..945996ab3ca3 100644
--- a/clients/client-redshift/src/pagination/DescribeReservedNodesPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeReservedNodesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeReservedNodes(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeScheduledActionsPaginator.ts b/clients/client-redshift/src/pagination/DescribeScheduledActionsPaginator.ts
index 570a33c44a60..24b61b999a67 100644
--- a/clients/client-redshift/src/pagination/DescribeScheduledActionsPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeScheduledActionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeScheduledActions(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeSnapshotCopyGrantsPaginator.ts b/clients/client-redshift/src/pagination/DescribeSnapshotCopyGrantsPaginator.ts
index d5b72c5950de..95ef583ea469 100644
--- a/clients/client-redshift/src/pagination/DescribeSnapshotCopyGrantsPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeSnapshotCopyGrantsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeSnapshotCopyGrants(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeSnapshotSchedulesPaginator.ts b/clients/client-redshift/src/pagination/DescribeSnapshotSchedulesPaginator.ts
index d42b24aec100..c1b7e784cbb7 100644
--- a/clients/client-redshift/src/pagination/DescribeSnapshotSchedulesPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeSnapshotSchedulesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeSnapshotSchedules(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeTableRestoreStatusPaginator.ts b/clients/client-redshift/src/pagination/DescribeTableRestoreStatusPaginator.ts
index 82f1721aa340..bccc147db534 100644
--- a/clients/client-redshift/src/pagination/DescribeTableRestoreStatusPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeTableRestoreStatusPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeTableRestoreStatus(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeTagsPaginator.ts b/clients/client-redshift/src/pagination/DescribeTagsPaginator.ts
index d07d9e299719..4ff6966abede 100644
--- a/clients/client-redshift/src/pagination/DescribeTagsPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeTagsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeTags(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/DescribeUsageLimitsPaginator.ts b/clients/client-redshift/src/pagination/DescribeUsageLimitsPaginator.ts
index 49624049c9dd..63e72e011717 100644
--- a/clients/client-redshift/src/pagination/DescribeUsageLimitsPaginator.ts
+++ b/clients/client-redshift/src/pagination/DescribeUsageLimitsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeUsageLimits(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/GetReservedNodeExchangeConfigurationOptionsPaginator.ts b/clients/client-redshift/src/pagination/GetReservedNodeExchangeConfigurationOptionsPaginator.ts
index 4cbae4a85606..4b9865c49c7f 100644
--- a/clients/client-redshift/src/pagination/GetReservedNodeExchangeConfigurationOptionsPaginator.ts
+++ b/clients/client-redshift/src/pagination/GetReservedNodeExchangeConfigurationOptionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetReservedNodeExchangeConfigurationOptions(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-redshift/src/pagination/GetReservedNodeExchangeOfferingsPaginator.ts b/clients/client-redshift/src/pagination/GetReservedNodeExchangeOfferingsPaginator.ts
index 4d61e6711274..f4e7ffd77d9b 100644
--- a/clients/client-redshift/src/pagination/GetReservedNodeExchangeOfferingsPaginator.ts
+++ b/clients/client-redshift/src/pagination/GetReservedNodeExchangeOfferingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetReservedNodeExchangeOfferings(
       throw new Error("Invalid client, expected Redshift | RedshiftClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rekognition/src/pagination/DescribeProjectVersionsPaginator.ts b/clients/client-rekognition/src/pagination/DescribeProjectVersionsPaginator.ts
index 9ed23ff133c3..deca837bb582 100644
--- a/clients/client-rekognition/src/pagination/DescribeProjectVersionsPaginator.ts
+++ b/clients/client-rekognition/src/pagination/DescribeProjectVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeProjectVersions(
       throw new Error("Invalid client, expected Rekognition | RekognitionClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rekognition/src/pagination/DescribeProjectsPaginator.ts b/clients/client-rekognition/src/pagination/DescribeProjectsPaginator.ts
index fb315f35eee2..da8d364fc949 100644
--- a/clients/client-rekognition/src/pagination/DescribeProjectsPaginator.ts
+++ b/clients/client-rekognition/src/pagination/DescribeProjectsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeProjects(
       throw new Error("Invalid client, expected Rekognition | RekognitionClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rekognition/src/pagination/GetCelebrityRecognitionPaginator.ts b/clients/client-rekognition/src/pagination/GetCelebrityRecognitionPaginator.ts
index 0027fbd73e1f..0800c174b567 100644
--- a/clients/client-rekognition/src/pagination/GetCelebrityRecognitionPaginator.ts
+++ b/clients/client-rekognition/src/pagination/GetCelebrityRecognitionPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetCelebrityRecognition(
       throw new Error("Invalid client, expected Rekognition | RekognitionClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rekognition/src/pagination/GetContentModerationPaginator.ts b/clients/client-rekognition/src/pagination/GetContentModerationPaginator.ts
index 562ec679bef5..96f70a665b0a 100644
--- a/clients/client-rekognition/src/pagination/GetContentModerationPaginator.ts
+++ b/clients/client-rekognition/src/pagination/GetContentModerationPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetContentModeration(
       throw new Error("Invalid client, expected Rekognition | RekognitionClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rekognition/src/pagination/GetFaceDetectionPaginator.ts b/clients/client-rekognition/src/pagination/GetFaceDetectionPaginator.ts
index 295e8906d9bc..6bd1c77b163d 100644
--- a/clients/client-rekognition/src/pagination/GetFaceDetectionPaginator.ts
+++ b/clients/client-rekognition/src/pagination/GetFaceDetectionPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetFaceDetection(
       throw new Error("Invalid client, expected Rekognition | RekognitionClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rekognition/src/pagination/GetFaceSearchPaginator.ts b/clients/client-rekognition/src/pagination/GetFaceSearchPaginator.ts
index 72235b6708a0..15d5632c105e 100644
--- a/clients/client-rekognition/src/pagination/GetFaceSearchPaginator.ts
+++ b/clients/client-rekognition/src/pagination/GetFaceSearchPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetFaceSearch(
       throw new Error("Invalid client, expected Rekognition | RekognitionClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rekognition/src/pagination/GetLabelDetectionPaginator.ts b/clients/client-rekognition/src/pagination/GetLabelDetectionPaginator.ts
index 5dea1b4d4112..1b98666ea197 100644
--- a/clients/client-rekognition/src/pagination/GetLabelDetectionPaginator.ts
+++ b/clients/client-rekognition/src/pagination/GetLabelDetectionPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetLabelDetection(
       throw new Error("Invalid client, expected Rekognition | RekognitionClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rekognition/src/pagination/GetPersonTrackingPaginator.ts b/clients/client-rekognition/src/pagination/GetPersonTrackingPaginator.ts
index d54598ba80e3..8bf42d59cecd 100644
--- a/clients/client-rekognition/src/pagination/GetPersonTrackingPaginator.ts
+++ b/clients/client-rekognition/src/pagination/GetPersonTrackingPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetPersonTracking(
       throw new Error("Invalid client, expected Rekognition | RekognitionClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rekognition/src/pagination/GetSegmentDetectionPaginator.ts b/clients/client-rekognition/src/pagination/GetSegmentDetectionPaginator.ts
index f7f4582d38cb..d4ca384c3914 100644
--- a/clients/client-rekognition/src/pagination/GetSegmentDetectionPaginator.ts
+++ b/clients/client-rekognition/src/pagination/GetSegmentDetectionPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetSegmentDetection(
       throw new Error("Invalid client, expected Rekognition | RekognitionClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rekognition/src/pagination/GetTextDetectionPaginator.ts b/clients/client-rekognition/src/pagination/GetTextDetectionPaginator.ts
index 71fb78c16c4b..ff154df1b187 100644
--- a/clients/client-rekognition/src/pagination/GetTextDetectionPaginator.ts
+++ b/clients/client-rekognition/src/pagination/GetTextDetectionPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetTextDetection(
       throw new Error("Invalid client, expected Rekognition | RekognitionClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rekognition/src/pagination/ListCollectionsPaginator.ts b/clients/client-rekognition/src/pagination/ListCollectionsPaginator.ts
index b9c34c9709c2..16dfbd5c4786 100644
--- a/clients/client-rekognition/src/pagination/ListCollectionsPaginator.ts
+++ b/clients/client-rekognition/src/pagination/ListCollectionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCollections(
       throw new Error("Invalid client, expected Rekognition | RekognitionClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rekognition/src/pagination/ListDatasetEntriesPaginator.ts b/clients/client-rekognition/src/pagination/ListDatasetEntriesPaginator.ts
index 2deae287a670..52312ce01dcc 100644
--- a/clients/client-rekognition/src/pagination/ListDatasetEntriesPaginator.ts
+++ b/clients/client-rekognition/src/pagination/ListDatasetEntriesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDatasetEntries(
       throw new Error("Invalid client, expected Rekognition | RekognitionClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rekognition/src/pagination/ListDatasetLabelsPaginator.ts b/clients/client-rekognition/src/pagination/ListDatasetLabelsPaginator.ts
index d49d66a37d07..b074d0b3daa4 100644
--- a/clients/client-rekognition/src/pagination/ListDatasetLabelsPaginator.ts
+++ b/clients/client-rekognition/src/pagination/ListDatasetLabelsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDatasetLabels(
       throw new Error("Invalid client, expected Rekognition | RekognitionClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rekognition/src/pagination/ListFacesPaginator.ts b/clients/client-rekognition/src/pagination/ListFacesPaginator.ts
index 313f56667539..db094c65f7d1 100644
--- a/clients/client-rekognition/src/pagination/ListFacesPaginator.ts
+++ b/clients/client-rekognition/src/pagination/ListFacesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListFaces(
       throw new Error("Invalid client, expected Rekognition | RekognitionClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rekognition/src/pagination/ListStreamProcessorsPaginator.ts b/clients/client-rekognition/src/pagination/ListStreamProcessorsPaginator.ts
index 89e26d9157df..81662eeebec8 100644
--- a/clients/client-rekognition/src/pagination/ListStreamProcessorsPaginator.ts
+++ b/clients/client-rekognition/src/pagination/ListStreamProcessorsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListStreamProcessors(
       throw new Error("Invalid client, expected Rekognition | RekognitionClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-resiliencehub/src/pagination/ListAlarmRecommendationsPaginator.ts b/clients/client-resiliencehub/src/pagination/ListAlarmRecommendationsPaginator.ts
index 752b03ac3b1d..6ba2b1925a64 100644
--- a/clients/client-resiliencehub/src/pagination/ListAlarmRecommendationsPaginator.ts
+++ b/clients/client-resiliencehub/src/pagination/ListAlarmRecommendationsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListAlarmRecommendations(
       throw new Error("Invalid client, expected Resiliencehub | ResiliencehubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-resiliencehub/src/pagination/ListAppAssessmentsPaginator.ts b/clients/client-resiliencehub/src/pagination/ListAppAssessmentsPaginator.ts
index 5f1563c17aa1..7ee57af1c5bc 100644
--- a/clients/client-resiliencehub/src/pagination/ListAppAssessmentsPaginator.ts
+++ b/clients/client-resiliencehub/src/pagination/ListAppAssessmentsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListAppAssessments(
       throw new Error("Invalid client, expected Resiliencehub | ResiliencehubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-resiliencehub/src/pagination/ListAppComponentCompliancesPaginator.ts b/clients/client-resiliencehub/src/pagination/ListAppComponentCompliancesPaginator.ts
index c1099222b294..33f2e2100fa7 100644
--- a/clients/client-resiliencehub/src/pagination/ListAppComponentCompliancesPaginator.ts
+++ b/clients/client-resiliencehub/src/pagination/ListAppComponentCompliancesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListAppComponentCompliances(
       throw new Error("Invalid client, expected Resiliencehub | ResiliencehubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-resiliencehub/src/pagination/ListAppComponentRecommendationsPaginator.ts b/clients/client-resiliencehub/src/pagination/ListAppComponentRecommendationsPaginator.ts
index 8ff41a5eee20..0c0f1b0ca185 100644
--- a/clients/client-resiliencehub/src/pagination/ListAppComponentRecommendationsPaginator.ts
+++ b/clients/client-resiliencehub/src/pagination/ListAppComponentRecommendationsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListAppComponentRecommendations(
       throw new Error("Invalid client, expected Resiliencehub | ResiliencehubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-resiliencehub/src/pagination/ListAppVersionResourceMappingsPaginator.ts b/clients/client-resiliencehub/src/pagination/ListAppVersionResourceMappingsPaginator.ts
index 19f0ca5aed70..8e31d543e8bf 100644
--- a/clients/client-resiliencehub/src/pagination/ListAppVersionResourceMappingsPaginator.ts
+++ b/clients/client-resiliencehub/src/pagination/ListAppVersionResourceMappingsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListAppVersionResourceMappings(
       throw new Error("Invalid client, expected Resiliencehub | ResiliencehubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-resiliencehub/src/pagination/ListAppVersionResourcesPaginator.ts b/clients/client-resiliencehub/src/pagination/ListAppVersionResourcesPaginator.ts
index 5fde3d28d5d7..3e5b59ee7ce9 100644
--- a/clients/client-resiliencehub/src/pagination/ListAppVersionResourcesPaginator.ts
+++ b/clients/client-resiliencehub/src/pagination/ListAppVersionResourcesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListAppVersionResources(
       throw new Error("Invalid client, expected Resiliencehub | ResiliencehubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-resiliencehub/src/pagination/ListAppVersionsPaginator.ts b/clients/client-resiliencehub/src/pagination/ListAppVersionsPaginator.ts
index f2dfa7d476ff..bae1b24ec28c 100644
--- a/clients/client-resiliencehub/src/pagination/ListAppVersionsPaginator.ts
+++ b/clients/client-resiliencehub/src/pagination/ListAppVersionsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListAppVersions(
       throw new Error("Invalid client, expected Resiliencehub | ResiliencehubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-resiliencehub/src/pagination/ListAppsPaginator.ts b/clients/client-resiliencehub/src/pagination/ListAppsPaginator.ts
index a25c32f56cc8..7239cc282229 100644
--- a/clients/client-resiliencehub/src/pagination/ListAppsPaginator.ts
+++ b/clients/client-resiliencehub/src/pagination/ListAppsPaginator.ts
@@ -46,8 +46,9 @@ export async function* paginateListApps(
       throw new Error("Invalid client, expected Resiliencehub | ResiliencehubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-resiliencehub/src/pagination/ListRecommendationTemplatesPaginator.ts b/clients/client-resiliencehub/src/pagination/ListRecommendationTemplatesPaginator.ts
index 238bc50a1d9c..28a63252df1c 100644
--- a/clients/client-resiliencehub/src/pagination/ListRecommendationTemplatesPaginator.ts
+++ b/clients/client-resiliencehub/src/pagination/ListRecommendationTemplatesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListRecommendationTemplates(
       throw new Error("Invalid client, expected Resiliencehub | ResiliencehubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-resiliencehub/src/pagination/ListResiliencyPoliciesPaginator.ts b/clients/client-resiliencehub/src/pagination/ListResiliencyPoliciesPaginator.ts
index 6088a16b81de..f730de63bbb8 100644
--- a/clients/client-resiliencehub/src/pagination/ListResiliencyPoliciesPaginator.ts
+++ b/clients/client-resiliencehub/src/pagination/ListResiliencyPoliciesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListResiliencyPolicies(
       throw new Error("Invalid client, expected Resiliencehub | ResiliencehubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-resiliencehub/src/pagination/ListSopRecommendationsPaginator.ts b/clients/client-resiliencehub/src/pagination/ListSopRecommendationsPaginator.ts
index d27c41df888a..0c92b245e1b9 100644
--- a/clients/client-resiliencehub/src/pagination/ListSopRecommendationsPaginator.ts
+++ b/clients/client-resiliencehub/src/pagination/ListSopRecommendationsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListSopRecommendations(
       throw new Error("Invalid client, expected Resiliencehub | ResiliencehubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-resiliencehub/src/pagination/ListSuggestedResiliencyPoliciesPaginator.ts b/clients/client-resiliencehub/src/pagination/ListSuggestedResiliencyPoliciesPaginator.ts
index e7f731f53e88..f39689201d38 100644
--- a/clients/client-resiliencehub/src/pagination/ListSuggestedResiliencyPoliciesPaginator.ts
+++ b/clients/client-resiliencehub/src/pagination/ListSuggestedResiliencyPoliciesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListSuggestedResiliencyPolicies(
       throw new Error("Invalid client, expected Resiliencehub | ResiliencehubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-resiliencehub/src/pagination/ListTestRecommendationsPaginator.ts b/clients/client-resiliencehub/src/pagination/ListTestRecommendationsPaginator.ts
index 53a02e52415d..ced97a9aa7dd 100644
--- a/clients/client-resiliencehub/src/pagination/ListTestRecommendationsPaginator.ts
+++ b/clients/client-resiliencehub/src/pagination/ListTestRecommendationsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListTestRecommendations(
       throw new Error("Invalid client, expected Resiliencehub | ResiliencehubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-resiliencehub/src/pagination/ListUnsupportedAppVersionResourcesPaginator.ts b/clients/client-resiliencehub/src/pagination/ListUnsupportedAppVersionResourcesPaginator.ts
index 4fb73b72e823..aaa51bb99147 100644
--- a/clients/client-resiliencehub/src/pagination/ListUnsupportedAppVersionResourcesPaginator.ts
+++ b/clients/client-resiliencehub/src/pagination/ListUnsupportedAppVersionResourcesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListUnsupportedAppVersionResources(
       throw new Error("Invalid client, expected Resiliencehub | ResiliencehubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-resource-groups-tagging-api/src/pagination/GetComplianceSummaryPaginator.ts b/clients/client-resource-groups-tagging-api/src/pagination/GetComplianceSummaryPaginator.ts
index a0b9d9bb67f6..785f7f291c15 100644
--- a/clients/client-resource-groups-tagging-api/src/pagination/GetComplianceSummaryPaginator.ts
+++ b/clients/client-resource-groups-tagging-api/src/pagination/GetComplianceSummaryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetComplianceSummary(
       throw new Error("Invalid client, expected ResourceGroupsTaggingAPI | ResourceGroupsTaggingAPIClient");
     }
     yield page;
+    const prevToken = token;
     token = page.PaginationToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-resource-groups-tagging-api/src/pagination/GetResourcesPaginator.ts b/clients/client-resource-groups-tagging-api/src/pagination/GetResourcesPaginator.ts
index 413a2133d69a..658c2b6845ed 100644
--- a/clients/client-resource-groups-tagging-api/src/pagination/GetResourcesPaginator.ts
+++ b/clients/client-resource-groups-tagging-api/src/pagination/GetResourcesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetResources(
       throw new Error("Invalid client, expected ResourceGroupsTaggingAPI | ResourceGroupsTaggingAPIClient");
     }
     yield page;
+    const prevToken = token;
     token = page.PaginationToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-resource-groups-tagging-api/src/pagination/GetTagKeysPaginator.ts b/clients/client-resource-groups-tagging-api/src/pagination/GetTagKeysPaginator.ts
index b79d46d7b78d..13d66024c9d0 100644
--- a/clients/client-resource-groups-tagging-api/src/pagination/GetTagKeysPaginator.ts
+++ b/clients/client-resource-groups-tagging-api/src/pagination/GetTagKeysPaginator.ts
@@ -46,8 +46,9 @@ export async function* paginateGetTagKeys(
       throw new Error("Invalid client, expected ResourceGroupsTaggingAPI | ResourceGroupsTaggingAPIClient");
     }
     yield page;
+    const prevToken = token;
     token = page.PaginationToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-resource-groups-tagging-api/src/pagination/GetTagValuesPaginator.ts b/clients/client-resource-groups-tagging-api/src/pagination/GetTagValuesPaginator.ts
index 528be1394542..a089c1877164 100644
--- a/clients/client-resource-groups-tagging-api/src/pagination/GetTagValuesPaginator.ts
+++ b/clients/client-resource-groups-tagging-api/src/pagination/GetTagValuesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateGetTagValues(
       throw new Error("Invalid client, expected ResourceGroupsTaggingAPI | ResourceGroupsTaggingAPIClient");
     }
     yield page;
+    const prevToken = token;
     token = page.PaginationToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-resource-groups/src/pagination/ListGroupResourcesPaginator.ts b/clients/client-resource-groups/src/pagination/ListGroupResourcesPaginator.ts
index 851ef00ccc5a..619cf2bd93e7 100644
--- a/clients/client-resource-groups/src/pagination/ListGroupResourcesPaginator.ts
+++ b/clients/client-resource-groups/src/pagination/ListGroupResourcesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListGroupResources(
       throw new Error("Invalid client, expected ResourceGroups | ResourceGroupsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-resource-groups/src/pagination/ListGroupsPaginator.ts b/clients/client-resource-groups/src/pagination/ListGroupsPaginator.ts
index 4dd2719ff3b2..7758d4bf0966 100644
--- a/clients/client-resource-groups/src/pagination/ListGroupsPaginator.ts
+++ b/clients/client-resource-groups/src/pagination/ListGroupsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListGroups(
       throw new Error("Invalid client, expected ResourceGroups | ResourceGroupsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-resource-groups/src/pagination/SearchResourcesPaginator.ts b/clients/client-resource-groups/src/pagination/SearchResourcesPaginator.ts
index 726505cd84ae..803c94ac4199 100644
--- a/clients/client-resource-groups/src/pagination/SearchResourcesPaginator.ts
+++ b/clients/client-resource-groups/src/pagination/SearchResourcesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchResources(
       throw new Error("Invalid client, expected ResourceGroups | ResourceGroupsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-robomaker/src/pagination/ListDeploymentJobsPaginator.ts b/clients/client-robomaker/src/pagination/ListDeploymentJobsPaginator.ts
index 1c8c255daaba..d14497557049 100644
--- a/clients/client-robomaker/src/pagination/ListDeploymentJobsPaginator.ts
+++ b/clients/client-robomaker/src/pagination/ListDeploymentJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDeploymentJobs(
       throw new Error("Invalid client, expected RoboMaker | RoboMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-robomaker/src/pagination/ListFleetsPaginator.ts b/clients/client-robomaker/src/pagination/ListFleetsPaginator.ts
index 8ee0681b217c..4aa795f626e9 100644
--- a/clients/client-robomaker/src/pagination/ListFleetsPaginator.ts
+++ b/clients/client-robomaker/src/pagination/ListFleetsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListFleets(
       throw new Error("Invalid client, expected RoboMaker | RoboMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-robomaker/src/pagination/ListRobotApplicationsPaginator.ts b/clients/client-robomaker/src/pagination/ListRobotApplicationsPaginator.ts
index 93192318eaa5..31b67047de2b 100644
--- a/clients/client-robomaker/src/pagination/ListRobotApplicationsPaginator.ts
+++ b/clients/client-robomaker/src/pagination/ListRobotApplicationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRobotApplications(
       throw new Error("Invalid client, expected RoboMaker | RoboMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-robomaker/src/pagination/ListRobotsPaginator.ts b/clients/client-robomaker/src/pagination/ListRobotsPaginator.ts
index 33b8e971ada7..416b41b00d23 100644
--- a/clients/client-robomaker/src/pagination/ListRobotsPaginator.ts
+++ b/clients/client-robomaker/src/pagination/ListRobotsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListRobots(
       throw new Error("Invalid client, expected RoboMaker | RoboMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-robomaker/src/pagination/ListSimulationApplicationsPaginator.ts b/clients/client-robomaker/src/pagination/ListSimulationApplicationsPaginator.ts
index 517acc0bfee4..2823a1c5d08b 100644
--- a/clients/client-robomaker/src/pagination/ListSimulationApplicationsPaginator.ts
+++ b/clients/client-robomaker/src/pagination/ListSimulationApplicationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSimulationApplications(
       throw new Error("Invalid client, expected RoboMaker | RoboMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-robomaker/src/pagination/ListSimulationJobBatchesPaginator.ts b/clients/client-robomaker/src/pagination/ListSimulationJobBatchesPaginator.ts
index e35621e37f38..ace458dfdd8e 100644
--- a/clients/client-robomaker/src/pagination/ListSimulationJobBatchesPaginator.ts
+++ b/clients/client-robomaker/src/pagination/ListSimulationJobBatchesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSimulationJobBatches(
       throw new Error("Invalid client, expected RoboMaker | RoboMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-robomaker/src/pagination/ListSimulationJobsPaginator.ts b/clients/client-robomaker/src/pagination/ListSimulationJobsPaginator.ts
index 4200ac4bc0ce..45f4b96496cb 100644
--- a/clients/client-robomaker/src/pagination/ListSimulationJobsPaginator.ts
+++ b/clients/client-robomaker/src/pagination/ListSimulationJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSimulationJobs(
       throw new Error("Invalid client, expected RoboMaker | RoboMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-robomaker/src/pagination/ListWorldExportJobsPaginator.ts b/clients/client-robomaker/src/pagination/ListWorldExportJobsPaginator.ts
index c421d79ec456..98743db18ddf 100644
--- a/clients/client-robomaker/src/pagination/ListWorldExportJobsPaginator.ts
+++ b/clients/client-robomaker/src/pagination/ListWorldExportJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListWorldExportJobs(
       throw new Error("Invalid client, expected RoboMaker | RoboMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-robomaker/src/pagination/ListWorldGenerationJobsPaginator.ts b/clients/client-robomaker/src/pagination/ListWorldGenerationJobsPaginator.ts
index e1a62434dd06..b7433f5272b2 100644
--- a/clients/client-robomaker/src/pagination/ListWorldGenerationJobsPaginator.ts
+++ b/clients/client-robomaker/src/pagination/ListWorldGenerationJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListWorldGenerationJobs(
       throw new Error("Invalid client, expected RoboMaker | RoboMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-robomaker/src/pagination/ListWorldTemplatesPaginator.ts b/clients/client-robomaker/src/pagination/ListWorldTemplatesPaginator.ts
index 0fc438fcfeda..d87a7edf4045 100644
--- a/clients/client-robomaker/src/pagination/ListWorldTemplatesPaginator.ts
+++ b/clients/client-robomaker/src/pagination/ListWorldTemplatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListWorldTemplates(
       throw new Error("Invalid client, expected RoboMaker | RoboMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-robomaker/src/pagination/ListWorldsPaginator.ts b/clients/client-robomaker/src/pagination/ListWorldsPaginator.ts
index e5ab451b755b..4a3f8306ad9c 100644
--- a/clients/client-robomaker/src/pagination/ListWorldsPaginator.ts
+++ b/clients/client-robomaker/src/pagination/ListWorldsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListWorlds(
       throw new Error("Invalid client, expected RoboMaker | RoboMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route-53-domains/src/pagination/ListDomainsPaginator.ts b/clients/client-route-53-domains/src/pagination/ListDomainsPaginator.ts
index ea8fe29af932..73dab6ce2d08 100644
--- a/clients/client-route-53-domains/src/pagination/ListDomainsPaginator.ts
+++ b/clients/client-route-53-domains/src/pagination/ListDomainsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListDomains(
       throw new Error("Invalid client, expected Route53Domains | Route53DomainsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextPageMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route-53-domains/src/pagination/ListOperationsPaginator.ts b/clients/client-route-53-domains/src/pagination/ListOperationsPaginator.ts
index 2889164ba0bc..c905b3c2de98 100644
--- a/clients/client-route-53-domains/src/pagination/ListOperationsPaginator.ts
+++ b/clients/client-route-53-domains/src/pagination/ListOperationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListOperations(
       throw new Error("Invalid client, expected Route53Domains | Route53DomainsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextPageMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route-53-domains/src/pagination/ListPricesPaginator.ts b/clients/client-route-53-domains/src/pagination/ListPricesPaginator.ts
index 233d8610f313..e58ee62713ba 100644
--- a/clients/client-route-53-domains/src/pagination/ListPricesPaginator.ts
+++ b/clients/client-route-53-domains/src/pagination/ListPricesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListPrices(
       throw new Error("Invalid client, expected Route53Domains | Route53DomainsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextPageMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route-53-domains/src/pagination/ViewBillingPaginator.ts b/clients/client-route-53-domains/src/pagination/ViewBillingPaginator.ts
index d56dd2e7da10..173c1b29ac4c 100644
--- a/clients/client-route-53-domains/src/pagination/ViewBillingPaginator.ts
+++ b/clients/client-route-53-domains/src/pagination/ViewBillingPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateViewBilling(
       throw new Error("Invalid client, expected Route53Domains | Route53DomainsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextPageMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route-53/src/pagination/ListHealthChecksPaginator.ts b/clients/client-route-53/src/pagination/ListHealthChecksPaginator.ts
index bd9627554db8..0e98db327eaa 100644
--- a/clients/client-route-53/src/pagination/ListHealthChecksPaginator.ts
+++ b/clients/client-route-53/src/pagination/ListHealthChecksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListHealthChecks(
       throw new Error("Invalid client, expected Route53 | Route53Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route-53/src/pagination/ListHostedZonesPaginator.ts b/clients/client-route-53/src/pagination/ListHostedZonesPaginator.ts
index f116117b699d..03d060a2b2b3 100644
--- a/clients/client-route-53/src/pagination/ListHostedZonesPaginator.ts
+++ b/clients/client-route-53/src/pagination/ListHostedZonesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListHostedZones(
       throw new Error("Invalid client, expected Route53 | Route53Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route-53/src/pagination/ListQueryLoggingConfigsPaginator.ts b/clients/client-route-53/src/pagination/ListQueryLoggingConfigsPaginator.ts
index bd7b05150ac6..c292497fac63 100644
--- a/clients/client-route-53/src/pagination/ListQueryLoggingConfigsPaginator.ts
+++ b/clients/client-route-53/src/pagination/ListQueryLoggingConfigsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListQueryLoggingConfigs(
       throw new Error("Invalid client, expected Route53 | Route53Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53-recovery-cluster/src/pagination/ListRoutingControlsPaginator.ts b/clients/client-route53-recovery-cluster/src/pagination/ListRoutingControlsPaginator.ts
index 13aa46d245a3..32b42abc59ce 100644
--- a/clients/client-route53-recovery-cluster/src/pagination/ListRoutingControlsPaginator.ts
+++ b/clients/client-route53-recovery-cluster/src/pagination/ListRoutingControlsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRoutingControls(
       throw new Error("Invalid client, expected Route53RecoveryCluster | Route53RecoveryClusterClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53-recovery-control-config/src/pagination/ListAssociatedRoute53HealthChecksPaginator.ts b/clients/client-route53-recovery-control-config/src/pagination/ListAssociatedRoute53HealthChecksPaginator.ts
index 5bc470f3f3eb..35907d9abc1e 100644
--- a/clients/client-route53-recovery-control-config/src/pagination/ListAssociatedRoute53HealthChecksPaginator.ts
+++ b/clients/client-route53-recovery-control-config/src/pagination/ListAssociatedRoute53HealthChecksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAssociatedRoute53HealthChecks(
       throw new Error("Invalid client, expected Route53RecoveryControlConfig | Route53RecoveryControlConfigClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53-recovery-control-config/src/pagination/ListClustersPaginator.ts b/clients/client-route53-recovery-control-config/src/pagination/ListClustersPaginator.ts
index 58f2b7cf2994..2cfe2796f7a2 100644
--- a/clients/client-route53-recovery-control-config/src/pagination/ListClustersPaginator.ts
+++ b/clients/client-route53-recovery-control-config/src/pagination/ListClustersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListClusters(
       throw new Error("Invalid client, expected Route53RecoveryControlConfig | Route53RecoveryControlConfigClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53-recovery-control-config/src/pagination/ListControlPanelsPaginator.ts b/clients/client-route53-recovery-control-config/src/pagination/ListControlPanelsPaginator.ts
index 9a8702f31f34..fad96ba84cf1 100644
--- a/clients/client-route53-recovery-control-config/src/pagination/ListControlPanelsPaginator.ts
+++ b/clients/client-route53-recovery-control-config/src/pagination/ListControlPanelsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListControlPanels(
       throw new Error("Invalid client, expected Route53RecoveryControlConfig | Route53RecoveryControlConfigClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53-recovery-control-config/src/pagination/ListRoutingControlsPaginator.ts b/clients/client-route53-recovery-control-config/src/pagination/ListRoutingControlsPaginator.ts
index 3998ad3c88a7..ddbe5c56181d 100644
--- a/clients/client-route53-recovery-control-config/src/pagination/ListRoutingControlsPaginator.ts
+++ b/clients/client-route53-recovery-control-config/src/pagination/ListRoutingControlsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRoutingControls(
       throw new Error("Invalid client, expected Route53RecoveryControlConfig | Route53RecoveryControlConfigClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53-recovery-control-config/src/pagination/ListSafetyRulesPaginator.ts b/clients/client-route53-recovery-control-config/src/pagination/ListSafetyRulesPaginator.ts
index 6261748690f1..4b6b71c88f38 100644
--- a/clients/client-route53-recovery-control-config/src/pagination/ListSafetyRulesPaginator.ts
+++ b/clients/client-route53-recovery-control-config/src/pagination/ListSafetyRulesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSafetyRules(
       throw new Error("Invalid client, expected Route53RecoveryControlConfig | Route53RecoveryControlConfigClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53-recovery-readiness/src/pagination/GetCellReadinessSummaryPaginator.ts b/clients/client-route53-recovery-readiness/src/pagination/GetCellReadinessSummaryPaginator.ts
index 49642c18518a..61c3d806e0c0 100644
--- a/clients/client-route53-recovery-readiness/src/pagination/GetCellReadinessSummaryPaginator.ts
+++ b/clients/client-route53-recovery-readiness/src/pagination/GetCellReadinessSummaryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetCellReadinessSummary(
       throw new Error("Invalid client, expected Route53RecoveryReadiness | Route53RecoveryReadinessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53-recovery-readiness/src/pagination/GetReadinessCheckResourceStatusPaginator.ts b/clients/client-route53-recovery-readiness/src/pagination/GetReadinessCheckResourceStatusPaginator.ts
index 1b28ba768475..f7955f8b9db3 100644
--- a/clients/client-route53-recovery-readiness/src/pagination/GetReadinessCheckResourceStatusPaginator.ts
+++ b/clients/client-route53-recovery-readiness/src/pagination/GetReadinessCheckResourceStatusPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetReadinessCheckResourceStatus(
       throw new Error("Invalid client, expected Route53RecoveryReadiness | Route53RecoveryReadinessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53-recovery-readiness/src/pagination/GetReadinessCheckStatusPaginator.ts b/clients/client-route53-recovery-readiness/src/pagination/GetReadinessCheckStatusPaginator.ts
index 5d6c4460837b..026d404efb7b 100644
--- a/clients/client-route53-recovery-readiness/src/pagination/GetReadinessCheckStatusPaginator.ts
+++ b/clients/client-route53-recovery-readiness/src/pagination/GetReadinessCheckStatusPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetReadinessCheckStatus(
       throw new Error("Invalid client, expected Route53RecoveryReadiness | Route53RecoveryReadinessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53-recovery-readiness/src/pagination/GetRecoveryGroupReadinessSummaryPaginator.ts b/clients/client-route53-recovery-readiness/src/pagination/GetRecoveryGroupReadinessSummaryPaginator.ts
index 1edf7da93652..3a38d3f0220f 100644
--- a/clients/client-route53-recovery-readiness/src/pagination/GetRecoveryGroupReadinessSummaryPaginator.ts
+++ b/clients/client-route53-recovery-readiness/src/pagination/GetRecoveryGroupReadinessSummaryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetRecoveryGroupReadinessSummary(
       throw new Error("Invalid client, expected Route53RecoveryReadiness | Route53RecoveryReadinessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53-recovery-readiness/src/pagination/ListCellsPaginator.ts b/clients/client-route53-recovery-readiness/src/pagination/ListCellsPaginator.ts
index 4c95372538c3..5679013a81ed 100644
--- a/clients/client-route53-recovery-readiness/src/pagination/ListCellsPaginator.ts
+++ b/clients/client-route53-recovery-readiness/src/pagination/ListCellsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListCells(
       throw new Error("Invalid client, expected Route53RecoveryReadiness | Route53RecoveryReadinessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53-recovery-readiness/src/pagination/ListCrossAccountAuthorizationsPaginator.ts b/clients/client-route53-recovery-readiness/src/pagination/ListCrossAccountAuthorizationsPaginator.ts
index 446c1095ce6f..a86071ab969d 100644
--- a/clients/client-route53-recovery-readiness/src/pagination/ListCrossAccountAuthorizationsPaginator.ts
+++ b/clients/client-route53-recovery-readiness/src/pagination/ListCrossAccountAuthorizationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCrossAccountAuthorizations(
       throw new Error("Invalid client, expected Route53RecoveryReadiness | Route53RecoveryReadinessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53-recovery-readiness/src/pagination/ListReadinessChecksPaginator.ts b/clients/client-route53-recovery-readiness/src/pagination/ListReadinessChecksPaginator.ts
index 7d026f816648..d7ce9b8ad942 100644
--- a/clients/client-route53-recovery-readiness/src/pagination/ListReadinessChecksPaginator.ts
+++ b/clients/client-route53-recovery-readiness/src/pagination/ListReadinessChecksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListReadinessChecks(
       throw new Error("Invalid client, expected Route53RecoveryReadiness | Route53RecoveryReadinessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53-recovery-readiness/src/pagination/ListRecoveryGroupsPaginator.ts b/clients/client-route53-recovery-readiness/src/pagination/ListRecoveryGroupsPaginator.ts
index f9d957bff243..13969372124c 100644
--- a/clients/client-route53-recovery-readiness/src/pagination/ListRecoveryGroupsPaginator.ts
+++ b/clients/client-route53-recovery-readiness/src/pagination/ListRecoveryGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRecoveryGroups(
       throw new Error("Invalid client, expected Route53RecoveryReadiness | Route53RecoveryReadinessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53-recovery-readiness/src/pagination/ListResourceSetsPaginator.ts b/clients/client-route53-recovery-readiness/src/pagination/ListResourceSetsPaginator.ts
index d852e5a23a05..427985f3e412 100644
--- a/clients/client-route53-recovery-readiness/src/pagination/ListResourceSetsPaginator.ts
+++ b/clients/client-route53-recovery-readiness/src/pagination/ListResourceSetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListResourceSets(
       throw new Error("Invalid client, expected Route53RecoveryReadiness | Route53RecoveryReadinessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53-recovery-readiness/src/pagination/ListRulesPaginator.ts b/clients/client-route53-recovery-readiness/src/pagination/ListRulesPaginator.ts
index e265193f59f4..ac362810da1f 100644
--- a/clients/client-route53-recovery-readiness/src/pagination/ListRulesPaginator.ts
+++ b/clients/client-route53-recovery-readiness/src/pagination/ListRulesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListRules(
       throw new Error("Invalid client, expected Route53RecoveryReadiness | Route53RecoveryReadinessClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53resolver/src/pagination/ListFirewallConfigsPaginator.ts b/clients/client-route53resolver/src/pagination/ListFirewallConfigsPaginator.ts
index 724a7c64c241..1da8a46dfaaa 100644
--- a/clients/client-route53resolver/src/pagination/ListFirewallConfigsPaginator.ts
+++ b/clients/client-route53resolver/src/pagination/ListFirewallConfigsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFirewallConfigs(
       throw new Error("Invalid client, expected Route53Resolver | Route53ResolverClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53resolver/src/pagination/ListFirewallDomainListsPaginator.ts b/clients/client-route53resolver/src/pagination/ListFirewallDomainListsPaginator.ts
index 693e1e226152..7fb38293f188 100644
--- a/clients/client-route53resolver/src/pagination/ListFirewallDomainListsPaginator.ts
+++ b/clients/client-route53resolver/src/pagination/ListFirewallDomainListsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFirewallDomainLists(
       throw new Error("Invalid client, expected Route53Resolver | Route53ResolverClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53resolver/src/pagination/ListFirewallDomainsPaginator.ts b/clients/client-route53resolver/src/pagination/ListFirewallDomainsPaginator.ts
index 7560e6d97ecb..4ae15c3107ad 100644
--- a/clients/client-route53resolver/src/pagination/ListFirewallDomainsPaginator.ts
+++ b/clients/client-route53resolver/src/pagination/ListFirewallDomainsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFirewallDomains(
       throw new Error("Invalid client, expected Route53Resolver | Route53ResolverClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53resolver/src/pagination/ListFirewallRuleGroupAssociationsPaginator.ts b/clients/client-route53resolver/src/pagination/ListFirewallRuleGroupAssociationsPaginator.ts
index 8659c612eee1..0e7268123932 100644
--- a/clients/client-route53resolver/src/pagination/ListFirewallRuleGroupAssociationsPaginator.ts
+++ b/clients/client-route53resolver/src/pagination/ListFirewallRuleGroupAssociationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFirewallRuleGroupAssociations(
       throw new Error("Invalid client, expected Route53Resolver | Route53ResolverClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53resolver/src/pagination/ListFirewallRuleGroupsPaginator.ts b/clients/client-route53resolver/src/pagination/ListFirewallRuleGroupsPaginator.ts
index 79080fdc4b39..7293ff7c04ab 100644
--- a/clients/client-route53resolver/src/pagination/ListFirewallRuleGroupsPaginator.ts
+++ b/clients/client-route53resolver/src/pagination/ListFirewallRuleGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFirewallRuleGroups(
       throw new Error("Invalid client, expected Route53Resolver | Route53ResolverClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53resolver/src/pagination/ListFirewallRulesPaginator.ts b/clients/client-route53resolver/src/pagination/ListFirewallRulesPaginator.ts
index fed82996e28f..76f1ff3ee2c6 100644
--- a/clients/client-route53resolver/src/pagination/ListFirewallRulesPaginator.ts
+++ b/clients/client-route53resolver/src/pagination/ListFirewallRulesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFirewallRules(
       throw new Error("Invalid client, expected Route53Resolver | Route53ResolverClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53resolver/src/pagination/ListResolverConfigsPaginator.ts b/clients/client-route53resolver/src/pagination/ListResolverConfigsPaginator.ts
index 16dd4329add4..ad9e24f9cefb 100644
--- a/clients/client-route53resolver/src/pagination/ListResolverConfigsPaginator.ts
+++ b/clients/client-route53resolver/src/pagination/ListResolverConfigsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListResolverConfigs(
       throw new Error("Invalid client, expected Route53Resolver | Route53ResolverClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53resolver/src/pagination/ListResolverDnssecConfigsPaginator.ts b/clients/client-route53resolver/src/pagination/ListResolverDnssecConfigsPaginator.ts
index 9911f57671f5..07e24ce86b27 100644
--- a/clients/client-route53resolver/src/pagination/ListResolverDnssecConfigsPaginator.ts
+++ b/clients/client-route53resolver/src/pagination/ListResolverDnssecConfigsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListResolverDnssecConfigs(
       throw new Error("Invalid client, expected Route53Resolver | Route53ResolverClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53resolver/src/pagination/ListResolverEndpointIpAddressesPaginator.ts b/clients/client-route53resolver/src/pagination/ListResolverEndpointIpAddressesPaginator.ts
index 83df24e07b54..7004eddf477e 100644
--- a/clients/client-route53resolver/src/pagination/ListResolverEndpointIpAddressesPaginator.ts
+++ b/clients/client-route53resolver/src/pagination/ListResolverEndpointIpAddressesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListResolverEndpointIpAddresses(
       throw new Error("Invalid client, expected Route53Resolver | Route53ResolverClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53resolver/src/pagination/ListResolverEndpointsPaginator.ts b/clients/client-route53resolver/src/pagination/ListResolverEndpointsPaginator.ts
index 0e7ac77ff7a9..1f6d341ed54f 100644
--- a/clients/client-route53resolver/src/pagination/ListResolverEndpointsPaginator.ts
+++ b/clients/client-route53resolver/src/pagination/ListResolverEndpointsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListResolverEndpoints(
       throw new Error("Invalid client, expected Route53Resolver | Route53ResolverClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53resolver/src/pagination/ListResolverQueryLogConfigAssociationsPaginator.ts b/clients/client-route53resolver/src/pagination/ListResolverQueryLogConfigAssociationsPaginator.ts
index 6720efe5aecc..7fcdbbd0e890 100644
--- a/clients/client-route53resolver/src/pagination/ListResolverQueryLogConfigAssociationsPaginator.ts
+++ b/clients/client-route53resolver/src/pagination/ListResolverQueryLogConfigAssociationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListResolverQueryLogConfigAssociations(
       throw new Error("Invalid client, expected Route53Resolver | Route53ResolverClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53resolver/src/pagination/ListResolverQueryLogConfigsPaginator.ts b/clients/client-route53resolver/src/pagination/ListResolverQueryLogConfigsPaginator.ts
index fa4489320db4..c05dda1c34bb 100644
--- a/clients/client-route53resolver/src/pagination/ListResolverQueryLogConfigsPaginator.ts
+++ b/clients/client-route53resolver/src/pagination/ListResolverQueryLogConfigsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListResolverQueryLogConfigs(
       throw new Error("Invalid client, expected Route53Resolver | Route53ResolverClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53resolver/src/pagination/ListResolverRuleAssociationsPaginator.ts b/clients/client-route53resolver/src/pagination/ListResolverRuleAssociationsPaginator.ts
index d83b0de986a3..759908bb7af3 100644
--- a/clients/client-route53resolver/src/pagination/ListResolverRuleAssociationsPaginator.ts
+++ b/clients/client-route53resolver/src/pagination/ListResolverRuleAssociationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListResolverRuleAssociations(
       throw new Error("Invalid client, expected Route53Resolver | Route53ResolverClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53resolver/src/pagination/ListResolverRulesPaginator.ts b/clients/client-route53resolver/src/pagination/ListResolverRulesPaginator.ts
index 24679eaaab0c..5fc02968e6dc 100644
--- a/clients/client-route53resolver/src/pagination/ListResolverRulesPaginator.ts
+++ b/clients/client-route53resolver/src/pagination/ListResolverRulesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListResolverRules(
       throw new Error("Invalid client, expected Route53Resolver | Route53ResolverClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-route53resolver/src/pagination/ListTagsForResourcePaginator.ts b/clients/client-route53resolver/src/pagination/ListTagsForResourcePaginator.ts
index f42b626e9542..57c0d4fb71ea 100644
--- a/clients/client-route53resolver/src/pagination/ListTagsForResourcePaginator.ts
+++ b/clients/client-route53resolver/src/pagination/ListTagsForResourcePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTagsForResource(
       throw new Error("Invalid client, expected Route53Resolver | Route53ResolverClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rum/src/pagination/GetAppMonitorDataPaginator.ts b/clients/client-rum/src/pagination/GetAppMonitorDataPaginator.ts
index ce0e0c7aeb3a..fec6a1309ba5 100644
--- a/clients/client-rum/src/pagination/GetAppMonitorDataPaginator.ts
+++ b/clients/client-rum/src/pagination/GetAppMonitorDataPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetAppMonitorData(
       throw new Error("Invalid client, expected RUM | RUMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-rum/src/pagination/ListAppMonitorsPaginator.ts b/clients/client-rum/src/pagination/ListAppMonitorsPaginator.ts
index f536a833cc79..cebdd896ace3 100644
--- a/clients/client-rum/src/pagination/ListAppMonitorsPaginator.ts
+++ b/clients/client-rum/src/pagination/ListAppMonitorsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAppMonitors(
       throw new Error("Invalid client, expected RUM | RUMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-s3-control/src/pagination/ListAccessPointsForObjectLambdaPaginator.ts b/clients/client-s3-control/src/pagination/ListAccessPointsForObjectLambdaPaginator.ts
index d2301fb0d60b..f23ce7146ac4 100644
--- a/clients/client-s3-control/src/pagination/ListAccessPointsForObjectLambdaPaginator.ts
+++ b/clients/client-s3-control/src/pagination/ListAccessPointsForObjectLambdaPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAccessPointsForObjectLambda(
       throw new Error("Invalid client, expected S3Control | S3ControlClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-s3-control/src/pagination/ListAccessPointsPaginator.ts b/clients/client-s3-control/src/pagination/ListAccessPointsPaginator.ts
index df84f37ce0c7..840d471ac2a3 100644
--- a/clients/client-s3-control/src/pagination/ListAccessPointsPaginator.ts
+++ b/clients/client-s3-control/src/pagination/ListAccessPointsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAccessPoints(
       throw new Error("Invalid client, expected S3Control | S3ControlClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-s3-control/src/pagination/ListJobsPaginator.ts b/clients/client-s3-control/src/pagination/ListJobsPaginator.ts
index 0e8d286ce3f6..7a8d043b624f 100644
--- a/clients/client-s3-control/src/pagination/ListJobsPaginator.ts
+++ b/clients/client-s3-control/src/pagination/ListJobsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListJobs(
       throw new Error("Invalid client, expected S3Control | S3ControlClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-s3-control/src/pagination/ListMultiRegionAccessPointsPaginator.ts b/clients/client-s3-control/src/pagination/ListMultiRegionAccessPointsPaginator.ts
index 62b8b5a4689b..dae50ff2a38a 100644
--- a/clients/client-s3-control/src/pagination/ListMultiRegionAccessPointsPaginator.ts
+++ b/clients/client-s3-control/src/pagination/ListMultiRegionAccessPointsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListMultiRegionAccessPoints(
       throw new Error("Invalid client, expected S3Control | S3ControlClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-s3-control/src/pagination/ListRegionalBucketsPaginator.ts b/clients/client-s3-control/src/pagination/ListRegionalBucketsPaginator.ts
index e03f3cd837bc..fc0420c54ad6 100644
--- a/clients/client-s3-control/src/pagination/ListRegionalBucketsPaginator.ts
+++ b/clients/client-s3-control/src/pagination/ListRegionalBucketsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRegionalBuckets(
       throw new Error("Invalid client, expected S3Control | S3ControlClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-s3-control/src/pagination/ListStorageLensConfigurationsPaginator.ts b/clients/client-s3-control/src/pagination/ListStorageLensConfigurationsPaginator.ts
index 436d5de53c77..4694b91d8609 100644
--- a/clients/client-s3-control/src/pagination/ListStorageLensConfigurationsPaginator.ts
+++ b/clients/client-s3-control/src/pagination/ListStorageLensConfigurationsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListStorageLensConfigurations(
       throw new Error("Invalid client, expected S3Control | S3ControlClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-s3/src/pagination/ListObjectsV2Paginator.ts b/clients/client-s3/src/pagination/ListObjectsV2Paginator.ts
index da696b876942..ba7edad50a95 100644
--- a/clients/client-s3/src/pagination/ListObjectsV2Paginator.ts
+++ b/clients/client-s3/src/pagination/ListObjectsV2Paginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListObjectsV2(
       throw new Error("Invalid client, expected S3 | S3Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextContinuationToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-s3/src/pagination/ListPartsPaginator.ts b/clients/client-s3/src/pagination/ListPartsPaginator.ts
index da90b310d7dd..cdc9f04a8b0d 100644
--- a/clients/client-s3/src/pagination/ListPartsPaginator.ts
+++ b/clients/client-s3/src/pagination/ListPartsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListParts(
       throw new Error("Invalid client, expected S3 | S3Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextPartNumberMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-s3outposts/src/pagination/ListEndpointsPaginator.ts b/clients/client-s3outposts/src/pagination/ListEndpointsPaginator.ts
index 653109756af2..d55ab397859a 100644
--- a/clients/client-s3outposts/src/pagination/ListEndpointsPaginator.ts
+++ b/clients/client-s3outposts/src/pagination/ListEndpointsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEndpoints(
       throw new Error("Invalid client, expected S3Outposts | S3OutpostsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-s3outposts/src/pagination/ListSharedEndpointsPaginator.ts b/clients/client-s3outposts/src/pagination/ListSharedEndpointsPaginator.ts
index caae1180b38d..ae20b25abaf7 100644
--- a/clients/client-s3outposts/src/pagination/ListSharedEndpointsPaginator.ts
+++ b/clients/client-s3outposts/src/pagination/ListSharedEndpointsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSharedEndpoints(
       throw new Error("Invalid client, expected S3Outposts | S3OutpostsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker-a2i-runtime/src/pagination/ListHumanLoopsPaginator.ts b/clients/client-sagemaker-a2i-runtime/src/pagination/ListHumanLoopsPaginator.ts
index 6b6bcd619c00..37ee7a1c23a6 100644
--- a/clients/client-sagemaker-a2i-runtime/src/pagination/ListHumanLoopsPaginator.ts
+++ b/clients/client-sagemaker-a2i-runtime/src/pagination/ListHumanLoopsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListHumanLoops(
       throw new Error("Invalid client, expected SageMakerA2IRuntime | SageMakerA2IRuntimeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListActionsPaginator.ts b/clients/client-sagemaker/src/pagination/ListActionsPaginator.ts
index 01b868cde900..7dbd6e604c48 100644
--- a/clients/client-sagemaker/src/pagination/ListActionsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListActionsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListActions(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListAlgorithmsPaginator.ts b/clients/client-sagemaker/src/pagination/ListAlgorithmsPaginator.ts
index fb7e58b5c03b..19e3b672cd1c 100644
--- a/clients/client-sagemaker/src/pagination/ListAlgorithmsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListAlgorithmsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAlgorithms(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListAppImageConfigsPaginator.ts b/clients/client-sagemaker/src/pagination/ListAppImageConfigsPaginator.ts
index 73562a56711d..88ef135bf3e0 100644
--- a/clients/client-sagemaker/src/pagination/ListAppImageConfigsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListAppImageConfigsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAppImageConfigs(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListAppsPaginator.ts b/clients/client-sagemaker/src/pagination/ListAppsPaginator.ts
index 4cb655caa59a..74f40bbaec5f 100644
--- a/clients/client-sagemaker/src/pagination/ListAppsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListAppsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListApps(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListArtifactsPaginator.ts b/clients/client-sagemaker/src/pagination/ListArtifactsPaginator.ts
index 61205e566db8..8bee19522e07 100644
--- a/clients/client-sagemaker/src/pagination/ListArtifactsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListArtifactsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListArtifacts(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListAssociationsPaginator.ts b/clients/client-sagemaker/src/pagination/ListAssociationsPaginator.ts
index 94a6de0e4a95..a701bd34b93a 100644
--- a/clients/client-sagemaker/src/pagination/ListAssociationsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListAssociationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAssociations(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListAutoMLJobsPaginator.ts b/clients/client-sagemaker/src/pagination/ListAutoMLJobsPaginator.ts
index 2e2a18556aca..0ba9b5585418 100644
--- a/clients/client-sagemaker/src/pagination/ListAutoMLJobsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListAutoMLJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAutoMLJobs(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListCandidatesForAutoMLJobPaginator.ts b/clients/client-sagemaker/src/pagination/ListCandidatesForAutoMLJobPaginator.ts
index 3a4d78aff8f7..08e643c6dc9e 100644
--- a/clients/client-sagemaker/src/pagination/ListCandidatesForAutoMLJobPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListCandidatesForAutoMLJobPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCandidatesForAutoMLJob(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListCodeRepositoriesPaginator.ts b/clients/client-sagemaker/src/pagination/ListCodeRepositoriesPaginator.ts
index bb53ae6958c4..a7573655790c 100644
--- a/clients/client-sagemaker/src/pagination/ListCodeRepositoriesPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListCodeRepositoriesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCodeRepositories(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListCompilationJobsPaginator.ts b/clients/client-sagemaker/src/pagination/ListCompilationJobsPaginator.ts
index 425a06ccc905..6d547b87e21f 100644
--- a/clients/client-sagemaker/src/pagination/ListCompilationJobsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListCompilationJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCompilationJobs(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListContextsPaginator.ts b/clients/client-sagemaker/src/pagination/ListContextsPaginator.ts
index e3f764d70a97..9249d206af6d 100644
--- a/clients/client-sagemaker/src/pagination/ListContextsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListContextsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListContexts(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListDataQualityJobDefinitionsPaginator.ts b/clients/client-sagemaker/src/pagination/ListDataQualityJobDefinitionsPaginator.ts
index 409092419554..5f9686e383f6 100644
--- a/clients/client-sagemaker/src/pagination/ListDataQualityJobDefinitionsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListDataQualityJobDefinitionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDataQualityJobDefinitions(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListDeviceFleetsPaginator.ts b/clients/client-sagemaker/src/pagination/ListDeviceFleetsPaginator.ts
index c4ac688bf323..e879564c5689 100644
--- a/clients/client-sagemaker/src/pagination/ListDeviceFleetsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListDeviceFleetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDeviceFleets(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListDevicesPaginator.ts b/clients/client-sagemaker/src/pagination/ListDevicesPaginator.ts
index 24187ede8243..9dcee78dc627 100644
--- a/clients/client-sagemaker/src/pagination/ListDevicesPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListDevicesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListDevices(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListDomainsPaginator.ts b/clients/client-sagemaker/src/pagination/ListDomainsPaginator.ts
index c8bac39b2ae3..d7457b434c59 100644
--- a/clients/client-sagemaker/src/pagination/ListDomainsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListDomainsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListDomains(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListEdgePackagingJobsPaginator.ts b/clients/client-sagemaker/src/pagination/ListEdgePackagingJobsPaginator.ts
index a981b2e6bd91..3805aace71cd 100644
--- a/clients/client-sagemaker/src/pagination/ListEdgePackagingJobsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListEdgePackagingJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEdgePackagingJobs(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListEndpointConfigsPaginator.ts b/clients/client-sagemaker/src/pagination/ListEndpointConfigsPaginator.ts
index 443f3dd99c47..ee753f021569 100644
--- a/clients/client-sagemaker/src/pagination/ListEndpointConfigsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListEndpointConfigsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEndpointConfigs(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListEndpointsPaginator.ts b/clients/client-sagemaker/src/pagination/ListEndpointsPaginator.ts
index 1268cbf152e5..1d15ddbe896d 100644
--- a/clients/client-sagemaker/src/pagination/ListEndpointsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListEndpointsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEndpoints(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListExperimentsPaginator.ts b/clients/client-sagemaker/src/pagination/ListExperimentsPaginator.ts
index 62bd6fdb55c3..16aad9a8f6e9 100644
--- a/clients/client-sagemaker/src/pagination/ListExperimentsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListExperimentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListExperiments(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListFlowDefinitionsPaginator.ts b/clients/client-sagemaker/src/pagination/ListFlowDefinitionsPaginator.ts
index 4ab19ff49211..b171b744b599 100644
--- a/clients/client-sagemaker/src/pagination/ListFlowDefinitionsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListFlowDefinitionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFlowDefinitions(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListHumanTaskUisPaginator.ts b/clients/client-sagemaker/src/pagination/ListHumanTaskUisPaginator.ts
index da1ec2ffcfc6..89b433d2ca0f 100644
--- a/clients/client-sagemaker/src/pagination/ListHumanTaskUisPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListHumanTaskUisPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListHumanTaskUis(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListHyperParameterTuningJobsPaginator.ts b/clients/client-sagemaker/src/pagination/ListHyperParameterTuningJobsPaginator.ts
index b709cb35a4c7..575521a1adf5 100644
--- a/clients/client-sagemaker/src/pagination/ListHyperParameterTuningJobsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListHyperParameterTuningJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListHyperParameterTuningJobs(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListImageVersionsPaginator.ts b/clients/client-sagemaker/src/pagination/ListImageVersionsPaginator.ts
index 20f3d32508d4..849c42fbc528 100644
--- a/clients/client-sagemaker/src/pagination/ListImageVersionsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListImageVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListImageVersions(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListImagesPaginator.ts b/clients/client-sagemaker/src/pagination/ListImagesPaginator.ts
index e8c80d7c6fe9..5c7778da1d23 100644
--- a/clients/client-sagemaker/src/pagination/ListImagesPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListImagesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListImages(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListInferenceRecommendationsJobsPaginator.ts b/clients/client-sagemaker/src/pagination/ListInferenceRecommendationsJobsPaginator.ts
index 29c6676f0a63..d5269b040403 100644
--- a/clients/client-sagemaker/src/pagination/ListInferenceRecommendationsJobsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListInferenceRecommendationsJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListInferenceRecommendationsJobs(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListLabelingJobsForWorkteamPaginator.ts b/clients/client-sagemaker/src/pagination/ListLabelingJobsForWorkteamPaginator.ts
index 79cd3cc990ca..b4978b13d675 100644
--- a/clients/client-sagemaker/src/pagination/ListLabelingJobsForWorkteamPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListLabelingJobsForWorkteamPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListLabelingJobsForWorkteam(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListLabelingJobsPaginator.ts b/clients/client-sagemaker/src/pagination/ListLabelingJobsPaginator.ts
index 8ad9e13e4df8..f963d9c2e995 100644
--- a/clients/client-sagemaker/src/pagination/ListLabelingJobsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListLabelingJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListLabelingJobs(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListLineageGroupsPaginator.ts b/clients/client-sagemaker/src/pagination/ListLineageGroupsPaginator.ts
index d18fd0548a32..3920970e3d49 100644
--- a/clients/client-sagemaker/src/pagination/ListLineageGroupsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListLineageGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListLineageGroups(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListModelBiasJobDefinitionsPaginator.ts b/clients/client-sagemaker/src/pagination/ListModelBiasJobDefinitionsPaginator.ts
index f60b95cb6559..6fc8141ff50e 100644
--- a/clients/client-sagemaker/src/pagination/ListModelBiasJobDefinitionsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListModelBiasJobDefinitionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListModelBiasJobDefinitions(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListModelExplainabilityJobDefinitionsPaginator.ts b/clients/client-sagemaker/src/pagination/ListModelExplainabilityJobDefinitionsPaginator.ts
index 27f2509f4ddf..fb31f59cb444 100644
--- a/clients/client-sagemaker/src/pagination/ListModelExplainabilityJobDefinitionsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListModelExplainabilityJobDefinitionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListModelExplainabilityJobDefinitions(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListModelMetadataPaginator.ts b/clients/client-sagemaker/src/pagination/ListModelMetadataPaginator.ts
index b80d77863997..f663cd68507e 100644
--- a/clients/client-sagemaker/src/pagination/ListModelMetadataPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListModelMetadataPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListModelMetadata(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListModelPackageGroupsPaginator.ts b/clients/client-sagemaker/src/pagination/ListModelPackageGroupsPaginator.ts
index 95714564b761..eb450a415b20 100644
--- a/clients/client-sagemaker/src/pagination/ListModelPackageGroupsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListModelPackageGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListModelPackageGroups(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListModelPackagesPaginator.ts b/clients/client-sagemaker/src/pagination/ListModelPackagesPaginator.ts
index e50f4fbde6db..6dc7a326de14 100644
--- a/clients/client-sagemaker/src/pagination/ListModelPackagesPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListModelPackagesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListModelPackages(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListModelQualityJobDefinitionsPaginator.ts b/clients/client-sagemaker/src/pagination/ListModelQualityJobDefinitionsPaginator.ts
index 0283a78183f3..0d9ce2f0d3e8 100644
--- a/clients/client-sagemaker/src/pagination/ListModelQualityJobDefinitionsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListModelQualityJobDefinitionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListModelQualityJobDefinitions(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListModelsPaginator.ts b/clients/client-sagemaker/src/pagination/ListModelsPaginator.ts
index 9c079553f565..fb01e083f655 100644
--- a/clients/client-sagemaker/src/pagination/ListModelsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListModelsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListModels(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListMonitoringExecutionsPaginator.ts b/clients/client-sagemaker/src/pagination/ListMonitoringExecutionsPaginator.ts
index 1615f5612fc9..aec3722216e7 100644
--- a/clients/client-sagemaker/src/pagination/ListMonitoringExecutionsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListMonitoringExecutionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListMonitoringExecutions(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListMonitoringSchedulesPaginator.ts b/clients/client-sagemaker/src/pagination/ListMonitoringSchedulesPaginator.ts
index 5933834dae54..f56e60fbf5e2 100644
--- a/clients/client-sagemaker/src/pagination/ListMonitoringSchedulesPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListMonitoringSchedulesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListMonitoringSchedules(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListNotebookInstanceLifecycleConfigsPaginator.ts b/clients/client-sagemaker/src/pagination/ListNotebookInstanceLifecycleConfigsPaginator.ts
index e117501918e8..6cf5f51a5106 100644
--- a/clients/client-sagemaker/src/pagination/ListNotebookInstanceLifecycleConfigsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListNotebookInstanceLifecycleConfigsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListNotebookInstanceLifecycleConfigs(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListNotebookInstancesPaginator.ts b/clients/client-sagemaker/src/pagination/ListNotebookInstancesPaginator.ts
index 1ea78cdd6527..eeb18449d125 100644
--- a/clients/client-sagemaker/src/pagination/ListNotebookInstancesPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListNotebookInstancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListNotebookInstances(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListPipelineExecutionStepsPaginator.ts b/clients/client-sagemaker/src/pagination/ListPipelineExecutionStepsPaginator.ts
index 6b8bb8aae00a..f05324519203 100644
--- a/clients/client-sagemaker/src/pagination/ListPipelineExecutionStepsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListPipelineExecutionStepsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPipelineExecutionSteps(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListPipelineExecutionsPaginator.ts b/clients/client-sagemaker/src/pagination/ListPipelineExecutionsPaginator.ts
index b29bcec42a0e..bca227b2105f 100644
--- a/clients/client-sagemaker/src/pagination/ListPipelineExecutionsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListPipelineExecutionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPipelineExecutions(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListPipelineParametersForExecutionPaginator.ts b/clients/client-sagemaker/src/pagination/ListPipelineParametersForExecutionPaginator.ts
index c05e22192486..a75bcaee9d81 100644
--- a/clients/client-sagemaker/src/pagination/ListPipelineParametersForExecutionPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListPipelineParametersForExecutionPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPipelineParametersForExecution(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListPipelinesPaginator.ts b/clients/client-sagemaker/src/pagination/ListPipelinesPaginator.ts
index 01403657338e..f0ab129ce4a2 100644
--- a/clients/client-sagemaker/src/pagination/ListPipelinesPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListPipelinesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPipelines(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListProcessingJobsPaginator.ts b/clients/client-sagemaker/src/pagination/ListProcessingJobsPaginator.ts
index 2fd83ef30982..79d5e7347df1 100644
--- a/clients/client-sagemaker/src/pagination/ListProcessingJobsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListProcessingJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListProcessingJobs(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListProjectsPaginator.ts b/clients/client-sagemaker/src/pagination/ListProjectsPaginator.ts
index 5ab9876080b7..1bd407b68caa 100644
--- a/clients/client-sagemaker/src/pagination/ListProjectsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListProjectsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListProjects(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListStudioLifecycleConfigsPaginator.ts b/clients/client-sagemaker/src/pagination/ListStudioLifecycleConfigsPaginator.ts
index 9d10dedd4e52..9774ea4cf2c9 100644
--- a/clients/client-sagemaker/src/pagination/ListStudioLifecycleConfigsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListStudioLifecycleConfigsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListStudioLifecycleConfigs(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListSubscribedWorkteamsPaginator.ts b/clients/client-sagemaker/src/pagination/ListSubscribedWorkteamsPaginator.ts
index bc2d0a269d95..d285629696eb 100644
--- a/clients/client-sagemaker/src/pagination/ListSubscribedWorkteamsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListSubscribedWorkteamsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSubscribedWorkteams(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListTagsPaginator.ts b/clients/client-sagemaker/src/pagination/ListTagsPaginator.ts
index c354a8fcf3d5..9d47338cb896 100644
--- a/clients/client-sagemaker/src/pagination/ListTagsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListTagsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListTags(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListTrainingJobsForHyperParameterTuningJobPaginator.ts b/clients/client-sagemaker/src/pagination/ListTrainingJobsForHyperParameterTuningJobPaginator.ts
index 9fd965c2ec2f..e67e858d930b 100644
--- a/clients/client-sagemaker/src/pagination/ListTrainingJobsForHyperParameterTuningJobPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListTrainingJobsForHyperParameterTuningJobPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTrainingJobsForHyperParameterTuningJob(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListTrainingJobsPaginator.ts b/clients/client-sagemaker/src/pagination/ListTrainingJobsPaginator.ts
index 061832402d44..2b03c70a67b8 100644
--- a/clients/client-sagemaker/src/pagination/ListTrainingJobsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListTrainingJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTrainingJobs(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListTransformJobsPaginator.ts b/clients/client-sagemaker/src/pagination/ListTransformJobsPaginator.ts
index 9f69ea34cc6b..78687dbe8af9 100644
--- a/clients/client-sagemaker/src/pagination/ListTransformJobsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListTransformJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTransformJobs(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListTrialComponentsPaginator.ts b/clients/client-sagemaker/src/pagination/ListTrialComponentsPaginator.ts
index 6da75f18a9b8..1dafcf662242 100644
--- a/clients/client-sagemaker/src/pagination/ListTrialComponentsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListTrialComponentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTrialComponents(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListTrialsPaginator.ts b/clients/client-sagemaker/src/pagination/ListTrialsPaginator.ts
index 284bf9125cfc..6b16e211802e 100644
--- a/clients/client-sagemaker/src/pagination/ListTrialsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListTrialsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListTrials(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListUserProfilesPaginator.ts b/clients/client-sagemaker/src/pagination/ListUserProfilesPaginator.ts
index 2d9a0e2b03fb..0da8c124eac0 100644
--- a/clients/client-sagemaker/src/pagination/ListUserProfilesPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListUserProfilesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListUserProfiles(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListWorkforcesPaginator.ts b/clients/client-sagemaker/src/pagination/ListWorkforcesPaginator.ts
index a5fcc5bfa499..2c4a038dbb02 100644
--- a/clients/client-sagemaker/src/pagination/ListWorkforcesPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListWorkforcesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListWorkforces(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/ListWorkteamsPaginator.ts b/clients/client-sagemaker/src/pagination/ListWorkteamsPaginator.ts
index eccf0eedfced..6060e78bfeb4 100644
--- a/clients/client-sagemaker/src/pagination/ListWorkteamsPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/ListWorkteamsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListWorkteams(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/QueryLineagePaginator.ts b/clients/client-sagemaker/src/pagination/QueryLineagePaginator.ts
index 9a1bec1eae29..88f2b656bbb7 100644
--- a/clients/client-sagemaker/src/pagination/QueryLineagePaginator.ts
+++ b/clients/client-sagemaker/src/pagination/QueryLineagePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateQueryLineage(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sagemaker/src/pagination/SearchPaginator.ts b/clients/client-sagemaker/src/pagination/SearchPaginator.ts
index 54b2305f6550..f012f3fd2bde 100644
--- a/clients/client-sagemaker/src/pagination/SearchPaginator.ts
+++ b/clients/client-sagemaker/src/pagination/SearchPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateSearch(
       throw new Error("Invalid client, expected SageMaker | SageMakerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-schemas/src/pagination/ListDiscoverersPaginator.ts b/clients/client-schemas/src/pagination/ListDiscoverersPaginator.ts
index 67582a2de691..7af887c0796b 100644
--- a/clients/client-schemas/src/pagination/ListDiscoverersPaginator.ts
+++ b/clients/client-schemas/src/pagination/ListDiscoverersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDiscoverers(
       throw new Error("Invalid client, expected Schemas | SchemasClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-schemas/src/pagination/ListRegistriesPaginator.ts b/clients/client-schemas/src/pagination/ListRegistriesPaginator.ts
index cad17b7d538a..f3b79415131c 100644
--- a/clients/client-schemas/src/pagination/ListRegistriesPaginator.ts
+++ b/clients/client-schemas/src/pagination/ListRegistriesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRegistries(
       throw new Error("Invalid client, expected Schemas | SchemasClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-schemas/src/pagination/ListSchemaVersionsPaginator.ts b/clients/client-schemas/src/pagination/ListSchemaVersionsPaginator.ts
index e67977cf3e95..6ce71f8b9cf2 100644
--- a/clients/client-schemas/src/pagination/ListSchemaVersionsPaginator.ts
+++ b/clients/client-schemas/src/pagination/ListSchemaVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSchemaVersions(
       throw new Error("Invalid client, expected Schemas | SchemasClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-schemas/src/pagination/ListSchemasPaginator.ts b/clients/client-schemas/src/pagination/ListSchemasPaginator.ts
index f999b03a94fe..59a973a789ba 100644
--- a/clients/client-schemas/src/pagination/ListSchemasPaginator.ts
+++ b/clients/client-schemas/src/pagination/ListSchemasPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListSchemas(
       throw new Error("Invalid client, expected Schemas | SchemasClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-schemas/src/pagination/SearchSchemasPaginator.ts b/clients/client-schemas/src/pagination/SearchSchemasPaginator.ts
index 1c463ce19cd4..efe80d28f501 100644
--- a/clients/client-schemas/src/pagination/SearchSchemasPaginator.ts
+++ b/clients/client-schemas/src/pagination/SearchSchemasPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchSchemas(
       throw new Error("Invalid client, expected Schemas | SchemasClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-secrets-manager/src/pagination/ListSecretVersionIdsPaginator.ts b/clients/client-secrets-manager/src/pagination/ListSecretVersionIdsPaginator.ts
index ac0a877e4285..f2da15b8c945 100644
--- a/clients/client-secrets-manager/src/pagination/ListSecretVersionIdsPaginator.ts
+++ b/clients/client-secrets-manager/src/pagination/ListSecretVersionIdsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSecretVersionIds(
       throw new Error("Invalid client, expected SecretsManager | SecretsManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-secrets-manager/src/pagination/ListSecretsPaginator.ts b/clients/client-secrets-manager/src/pagination/ListSecretsPaginator.ts
index 2f5acd39bab6..616d747b4fb9 100644
--- a/clients/client-secrets-manager/src/pagination/ListSecretsPaginator.ts
+++ b/clients/client-secrets-manager/src/pagination/ListSecretsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListSecrets(
       throw new Error("Invalid client, expected SecretsManager | SecretsManagerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-securityhub/src/pagination/DescribeActionTargetsPaginator.ts b/clients/client-securityhub/src/pagination/DescribeActionTargetsPaginator.ts
index bde8cabccda8..4deb5f72add6 100644
--- a/clients/client-securityhub/src/pagination/DescribeActionTargetsPaginator.ts
+++ b/clients/client-securityhub/src/pagination/DescribeActionTargetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeActionTargets(
       throw new Error("Invalid client, expected SecurityHub | SecurityHubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-securityhub/src/pagination/DescribeProductsPaginator.ts b/clients/client-securityhub/src/pagination/DescribeProductsPaginator.ts
index 191940a3cd5e..12033bf7e816 100644
--- a/clients/client-securityhub/src/pagination/DescribeProductsPaginator.ts
+++ b/clients/client-securityhub/src/pagination/DescribeProductsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeProducts(
       throw new Error("Invalid client, expected SecurityHub | SecurityHubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-securityhub/src/pagination/DescribeStandardsControlsPaginator.ts b/clients/client-securityhub/src/pagination/DescribeStandardsControlsPaginator.ts
index f55e1d4d9dae..072be79fd229 100644
--- a/clients/client-securityhub/src/pagination/DescribeStandardsControlsPaginator.ts
+++ b/clients/client-securityhub/src/pagination/DescribeStandardsControlsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeStandardsControls(
       throw new Error("Invalid client, expected SecurityHub | SecurityHubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-securityhub/src/pagination/DescribeStandardsPaginator.ts b/clients/client-securityhub/src/pagination/DescribeStandardsPaginator.ts
index 54493ff8bbd2..13bf573f9b5c 100644
--- a/clients/client-securityhub/src/pagination/DescribeStandardsPaginator.ts
+++ b/clients/client-securityhub/src/pagination/DescribeStandardsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeStandards(
       throw new Error("Invalid client, expected SecurityHub | SecurityHubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-securityhub/src/pagination/GetEnabledStandardsPaginator.ts b/clients/client-securityhub/src/pagination/GetEnabledStandardsPaginator.ts
index bfd3ad72a3ae..a4768fe24bc1 100644
--- a/clients/client-securityhub/src/pagination/GetEnabledStandardsPaginator.ts
+++ b/clients/client-securityhub/src/pagination/GetEnabledStandardsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetEnabledStandards(
       throw new Error("Invalid client, expected SecurityHub | SecurityHubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-securityhub/src/pagination/GetFindingsPaginator.ts b/clients/client-securityhub/src/pagination/GetFindingsPaginator.ts
index eb0e522a1433..1a2af813018f 100644
--- a/clients/client-securityhub/src/pagination/GetFindingsPaginator.ts
+++ b/clients/client-securityhub/src/pagination/GetFindingsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateGetFindings(
       throw new Error("Invalid client, expected SecurityHub | SecurityHubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-securityhub/src/pagination/GetInsightsPaginator.ts b/clients/client-securityhub/src/pagination/GetInsightsPaginator.ts
index bbc1178b9b2d..8155eddff45f 100644
--- a/clients/client-securityhub/src/pagination/GetInsightsPaginator.ts
+++ b/clients/client-securityhub/src/pagination/GetInsightsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateGetInsights(
       throw new Error("Invalid client, expected SecurityHub | SecurityHubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-securityhub/src/pagination/ListEnabledProductsForImportPaginator.ts b/clients/client-securityhub/src/pagination/ListEnabledProductsForImportPaginator.ts
index 8ecfe8692cf5..1b9e68f19a18 100644
--- a/clients/client-securityhub/src/pagination/ListEnabledProductsForImportPaginator.ts
+++ b/clients/client-securityhub/src/pagination/ListEnabledProductsForImportPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEnabledProductsForImport(
       throw new Error("Invalid client, expected SecurityHub | SecurityHubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-securityhub/src/pagination/ListFindingAggregatorsPaginator.ts b/clients/client-securityhub/src/pagination/ListFindingAggregatorsPaginator.ts
index 5bde28da4826..ae7f87cc9248 100644
--- a/clients/client-securityhub/src/pagination/ListFindingAggregatorsPaginator.ts
+++ b/clients/client-securityhub/src/pagination/ListFindingAggregatorsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFindingAggregators(
       throw new Error("Invalid client, expected SecurityHub | SecurityHubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-securityhub/src/pagination/ListInvitationsPaginator.ts b/clients/client-securityhub/src/pagination/ListInvitationsPaginator.ts
index c21e7f8c8dfb..8c9921a20d34 100644
--- a/clients/client-securityhub/src/pagination/ListInvitationsPaginator.ts
+++ b/clients/client-securityhub/src/pagination/ListInvitationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListInvitations(
       throw new Error("Invalid client, expected SecurityHub | SecurityHubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-securityhub/src/pagination/ListMembersPaginator.ts b/clients/client-securityhub/src/pagination/ListMembersPaginator.ts
index b236fd1f16cd..b002a1d405a1 100644
--- a/clients/client-securityhub/src/pagination/ListMembersPaginator.ts
+++ b/clients/client-securityhub/src/pagination/ListMembersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListMembers(
       throw new Error("Invalid client, expected SecurityHub | SecurityHubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-securityhub/src/pagination/ListOrganizationAdminAccountsPaginator.ts b/clients/client-securityhub/src/pagination/ListOrganizationAdminAccountsPaginator.ts
index 69a8ef71888f..21161c8ab88a 100644
--- a/clients/client-securityhub/src/pagination/ListOrganizationAdminAccountsPaginator.ts
+++ b/clients/client-securityhub/src/pagination/ListOrganizationAdminAccountsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListOrganizationAdminAccounts(
       throw new Error("Invalid client, expected SecurityHub | SecurityHubClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-serverlessapplicationrepository/src/pagination/ListApplicationDependenciesPaginator.ts b/clients/client-serverlessapplicationrepository/src/pagination/ListApplicationDependenciesPaginator.ts
index bb96b40d4dcd..7926de8f9529 100644
--- a/clients/client-serverlessapplicationrepository/src/pagination/ListApplicationDependenciesPaginator.ts
+++ b/clients/client-serverlessapplicationrepository/src/pagination/ListApplicationDependenciesPaginator.ts
@@ -53,8 +53,9 @@ export async function* paginateListApplicationDependencies(
       );
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-serverlessapplicationrepository/src/pagination/ListApplicationVersionsPaginator.ts b/clients/client-serverlessapplicationrepository/src/pagination/ListApplicationVersionsPaginator.ts
index ac18887bdf08..e9f121ca42df 100644
--- a/clients/client-serverlessapplicationrepository/src/pagination/ListApplicationVersionsPaginator.ts
+++ b/clients/client-serverlessapplicationrepository/src/pagination/ListApplicationVersionsPaginator.ts
@@ -53,8 +53,9 @@ export async function* paginateListApplicationVersions(
       );
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-serverlessapplicationrepository/src/pagination/ListApplicationsPaginator.ts b/clients/client-serverlessapplicationrepository/src/pagination/ListApplicationsPaginator.ts
index 194c10b42ff6..cb8ed41d20db 100644
--- a/clients/client-serverlessapplicationrepository/src/pagination/ListApplicationsPaginator.ts
+++ b/clients/client-serverlessapplicationrepository/src/pagination/ListApplicationsPaginator.ts
@@ -53,8 +53,9 @@ export async function* paginateListApplications(
       );
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-catalog-appregistry/src/pagination/ListApplicationsPaginator.ts b/clients/client-service-catalog-appregistry/src/pagination/ListApplicationsPaginator.ts
index 97a9992388d3..9a39f9af4592 100644
--- a/clients/client-service-catalog-appregistry/src/pagination/ListApplicationsPaginator.ts
+++ b/clients/client-service-catalog-appregistry/src/pagination/ListApplicationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListApplications(
       throw new Error("Invalid client, expected ServiceCatalogAppRegistry | ServiceCatalogAppRegistryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-catalog-appregistry/src/pagination/ListAssociatedAttributeGroupsPaginator.ts b/clients/client-service-catalog-appregistry/src/pagination/ListAssociatedAttributeGroupsPaginator.ts
index 8b37b4088c9f..fa8786e4b398 100644
--- a/clients/client-service-catalog-appregistry/src/pagination/ListAssociatedAttributeGroupsPaginator.ts
+++ b/clients/client-service-catalog-appregistry/src/pagination/ListAssociatedAttributeGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAssociatedAttributeGroups(
       throw new Error("Invalid client, expected ServiceCatalogAppRegistry | ServiceCatalogAppRegistryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-catalog-appregistry/src/pagination/ListAssociatedResourcesPaginator.ts b/clients/client-service-catalog-appregistry/src/pagination/ListAssociatedResourcesPaginator.ts
index 873334cd4811..7ad5d434d089 100644
--- a/clients/client-service-catalog-appregistry/src/pagination/ListAssociatedResourcesPaginator.ts
+++ b/clients/client-service-catalog-appregistry/src/pagination/ListAssociatedResourcesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAssociatedResources(
       throw new Error("Invalid client, expected ServiceCatalogAppRegistry | ServiceCatalogAppRegistryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-catalog-appregistry/src/pagination/ListAttributeGroupsPaginator.ts b/clients/client-service-catalog-appregistry/src/pagination/ListAttributeGroupsPaginator.ts
index 496f3987da59..f93f6001c3e7 100644
--- a/clients/client-service-catalog-appregistry/src/pagination/ListAttributeGroupsPaginator.ts
+++ b/clients/client-service-catalog-appregistry/src/pagination/ListAttributeGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAttributeGroups(
       throw new Error("Invalid client, expected ServiceCatalogAppRegistry | ServiceCatalogAppRegistryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-catalog/src/pagination/DescribePortfolioSharesPaginator.ts b/clients/client-service-catalog/src/pagination/DescribePortfolioSharesPaginator.ts
index 964e09bff696..390a13b9042a 100644
--- a/clients/client-service-catalog/src/pagination/DescribePortfolioSharesPaginator.ts
+++ b/clients/client-service-catalog/src/pagination/DescribePortfolioSharesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribePortfolioShares(
       throw new Error("Invalid client, expected ServiceCatalog | ServiceCatalogClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextPageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-catalog/src/pagination/GetProvisionedProductOutputsPaginator.ts b/clients/client-service-catalog/src/pagination/GetProvisionedProductOutputsPaginator.ts
index 6452c9bf5543..366e916520b5 100644
--- a/clients/client-service-catalog/src/pagination/GetProvisionedProductOutputsPaginator.ts
+++ b/clients/client-service-catalog/src/pagination/GetProvisionedProductOutputsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetProvisionedProductOutputs(
       throw new Error("Invalid client, expected ServiceCatalog | ServiceCatalogClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextPageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-catalog/src/pagination/ListAcceptedPortfolioSharesPaginator.ts b/clients/client-service-catalog/src/pagination/ListAcceptedPortfolioSharesPaginator.ts
index 9611982a78d7..267047f4d3ef 100644
--- a/clients/client-service-catalog/src/pagination/ListAcceptedPortfolioSharesPaginator.ts
+++ b/clients/client-service-catalog/src/pagination/ListAcceptedPortfolioSharesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAcceptedPortfolioShares(
       throw new Error("Invalid client, expected ServiceCatalog | ServiceCatalogClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextPageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-catalog/src/pagination/ListBudgetsForResourcePaginator.ts b/clients/client-service-catalog/src/pagination/ListBudgetsForResourcePaginator.ts
index e8627c7a744d..caf8b27bba3c 100644
--- a/clients/client-service-catalog/src/pagination/ListBudgetsForResourcePaginator.ts
+++ b/clients/client-service-catalog/src/pagination/ListBudgetsForResourcePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListBudgetsForResource(
       throw new Error("Invalid client, expected ServiceCatalog | ServiceCatalogClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextPageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-catalog/src/pagination/ListConstraintsForPortfolioPaginator.ts b/clients/client-service-catalog/src/pagination/ListConstraintsForPortfolioPaginator.ts
index 1451b1d04d66..12bf445ef494 100644
--- a/clients/client-service-catalog/src/pagination/ListConstraintsForPortfolioPaginator.ts
+++ b/clients/client-service-catalog/src/pagination/ListConstraintsForPortfolioPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListConstraintsForPortfolio(
       throw new Error("Invalid client, expected ServiceCatalog | ServiceCatalogClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextPageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-catalog/src/pagination/ListLaunchPathsPaginator.ts b/clients/client-service-catalog/src/pagination/ListLaunchPathsPaginator.ts
index fc65be0f355e..d1d91edee410 100644
--- a/clients/client-service-catalog/src/pagination/ListLaunchPathsPaginator.ts
+++ b/clients/client-service-catalog/src/pagination/ListLaunchPathsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListLaunchPaths(
       throw new Error("Invalid client, expected ServiceCatalog | ServiceCatalogClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextPageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-catalog/src/pagination/ListOrganizationPortfolioAccessPaginator.ts b/clients/client-service-catalog/src/pagination/ListOrganizationPortfolioAccessPaginator.ts
index 971388f7ea5d..bdc1a9f9e04d 100644
--- a/clients/client-service-catalog/src/pagination/ListOrganizationPortfolioAccessPaginator.ts
+++ b/clients/client-service-catalog/src/pagination/ListOrganizationPortfolioAccessPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListOrganizationPortfolioAccess(
       throw new Error("Invalid client, expected ServiceCatalog | ServiceCatalogClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextPageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-catalog/src/pagination/ListPortfolioAccessPaginator.ts b/clients/client-service-catalog/src/pagination/ListPortfolioAccessPaginator.ts
index 5467c7b9c040..2af2b1edac2a 100644
--- a/clients/client-service-catalog/src/pagination/ListPortfolioAccessPaginator.ts
+++ b/clients/client-service-catalog/src/pagination/ListPortfolioAccessPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPortfolioAccess(
       throw new Error("Invalid client, expected ServiceCatalog | ServiceCatalogClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextPageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-catalog/src/pagination/ListPortfoliosForProductPaginator.ts b/clients/client-service-catalog/src/pagination/ListPortfoliosForProductPaginator.ts
index 43898972accc..e9c56d6c1647 100644
--- a/clients/client-service-catalog/src/pagination/ListPortfoliosForProductPaginator.ts
+++ b/clients/client-service-catalog/src/pagination/ListPortfoliosForProductPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPortfoliosForProduct(
       throw new Error("Invalid client, expected ServiceCatalog | ServiceCatalogClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextPageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-catalog/src/pagination/ListPortfoliosPaginator.ts b/clients/client-service-catalog/src/pagination/ListPortfoliosPaginator.ts
index 5be91e54e19e..1c75ec665a33 100644
--- a/clients/client-service-catalog/src/pagination/ListPortfoliosPaginator.ts
+++ b/clients/client-service-catalog/src/pagination/ListPortfoliosPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPortfolios(
       throw new Error("Invalid client, expected ServiceCatalog | ServiceCatalogClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextPageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-catalog/src/pagination/ListPrincipalsForPortfolioPaginator.ts b/clients/client-service-catalog/src/pagination/ListPrincipalsForPortfolioPaginator.ts
index c2908fb17969..c021f35f6dd3 100644
--- a/clients/client-service-catalog/src/pagination/ListPrincipalsForPortfolioPaginator.ts
+++ b/clients/client-service-catalog/src/pagination/ListPrincipalsForPortfolioPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPrincipalsForPortfolio(
       throw new Error("Invalid client, expected ServiceCatalog | ServiceCatalogClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextPageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-catalog/src/pagination/ListProvisioningArtifactsForServiceActionPaginator.ts b/clients/client-service-catalog/src/pagination/ListProvisioningArtifactsForServiceActionPaginator.ts
index 7f9d0f2e3cd0..19091e989c5d 100644
--- a/clients/client-service-catalog/src/pagination/ListProvisioningArtifactsForServiceActionPaginator.ts
+++ b/clients/client-service-catalog/src/pagination/ListProvisioningArtifactsForServiceActionPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListProvisioningArtifactsForServiceAction(
       throw new Error("Invalid client, expected ServiceCatalog | ServiceCatalogClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextPageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-catalog/src/pagination/ListResourcesForTagOptionPaginator.ts b/clients/client-service-catalog/src/pagination/ListResourcesForTagOptionPaginator.ts
index 3af6dc2c7101..382b73fdb84c 100644
--- a/clients/client-service-catalog/src/pagination/ListResourcesForTagOptionPaginator.ts
+++ b/clients/client-service-catalog/src/pagination/ListResourcesForTagOptionPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListResourcesForTagOption(
       throw new Error("Invalid client, expected ServiceCatalog | ServiceCatalogClient");
     }
     yield page;
+    const prevToken = token;
     token = page.PageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-catalog/src/pagination/ListServiceActionsForProvisioningArtifactPaginator.ts b/clients/client-service-catalog/src/pagination/ListServiceActionsForProvisioningArtifactPaginator.ts
index b9a99a069102..72896f138c4f 100644
--- a/clients/client-service-catalog/src/pagination/ListServiceActionsForProvisioningArtifactPaginator.ts
+++ b/clients/client-service-catalog/src/pagination/ListServiceActionsForProvisioningArtifactPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListServiceActionsForProvisioningArtifact(
       throw new Error("Invalid client, expected ServiceCatalog | ServiceCatalogClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextPageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-catalog/src/pagination/ListServiceActionsPaginator.ts b/clients/client-service-catalog/src/pagination/ListServiceActionsPaginator.ts
index 36a4317a9417..92da849b0bb6 100644
--- a/clients/client-service-catalog/src/pagination/ListServiceActionsPaginator.ts
+++ b/clients/client-service-catalog/src/pagination/ListServiceActionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListServiceActions(
       throw new Error("Invalid client, expected ServiceCatalog | ServiceCatalogClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextPageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-catalog/src/pagination/ListTagOptionsPaginator.ts b/clients/client-service-catalog/src/pagination/ListTagOptionsPaginator.ts
index d5c94891db24..04c681a8098b 100644
--- a/clients/client-service-catalog/src/pagination/ListTagOptionsPaginator.ts
+++ b/clients/client-service-catalog/src/pagination/ListTagOptionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTagOptions(
       throw new Error("Invalid client, expected ServiceCatalog | ServiceCatalogClient");
     }
     yield page;
+    const prevToken = token;
     token = page.PageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-catalog/src/pagination/SearchProductsAsAdminPaginator.ts b/clients/client-service-catalog/src/pagination/SearchProductsAsAdminPaginator.ts
index f74959852b2e..6709eb6c15d6 100644
--- a/clients/client-service-catalog/src/pagination/SearchProductsAsAdminPaginator.ts
+++ b/clients/client-service-catalog/src/pagination/SearchProductsAsAdminPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchProductsAsAdmin(
       throw new Error("Invalid client, expected ServiceCatalog | ServiceCatalogClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextPageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-catalog/src/pagination/SearchProductsPaginator.ts b/clients/client-service-catalog/src/pagination/SearchProductsPaginator.ts
index 18e93b97818e..7ea833f5de4f 100644
--- a/clients/client-service-catalog/src/pagination/SearchProductsPaginator.ts
+++ b/clients/client-service-catalog/src/pagination/SearchProductsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchProducts(
       throw new Error("Invalid client, expected ServiceCatalog | ServiceCatalogClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextPageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-catalog/src/pagination/SearchProvisionedProductsPaginator.ts b/clients/client-service-catalog/src/pagination/SearchProvisionedProductsPaginator.ts
index 0a4ecae3efd2..76ab4a47687b 100644
--- a/clients/client-service-catalog/src/pagination/SearchProvisionedProductsPaginator.ts
+++ b/clients/client-service-catalog/src/pagination/SearchProvisionedProductsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchProvisionedProducts(
       throw new Error("Invalid client, expected ServiceCatalog | ServiceCatalogClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextPageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-quotas/src/pagination/ListAWSDefaultServiceQuotasPaginator.ts b/clients/client-service-quotas/src/pagination/ListAWSDefaultServiceQuotasPaginator.ts
index 884a5b8c8d14..b200e3324f3f 100644
--- a/clients/client-service-quotas/src/pagination/ListAWSDefaultServiceQuotasPaginator.ts
+++ b/clients/client-service-quotas/src/pagination/ListAWSDefaultServiceQuotasPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAWSDefaultServiceQuotas(
       throw new Error("Invalid client, expected ServiceQuotas | ServiceQuotasClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-quotas/src/pagination/ListRequestedServiceQuotaChangeHistoryByQuotaPaginator.ts b/clients/client-service-quotas/src/pagination/ListRequestedServiceQuotaChangeHistoryByQuotaPaginator.ts
index ed39597bf070..2f2350b8127e 100644
--- a/clients/client-service-quotas/src/pagination/ListRequestedServiceQuotaChangeHistoryByQuotaPaginator.ts
+++ b/clients/client-service-quotas/src/pagination/ListRequestedServiceQuotaChangeHistoryByQuotaPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRequestedServiceQuotaChangeHistoryByQuota(
       throw new Error("Invalid client, expected ServiceQuotas | ServiceQuotasClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-quotas/src/pagination/ListRequestedServiceQuotaChangeHistoryPaginator.ts b/clients/client-service-quotas/src/pagination/ListRequestedServiceQuotaChangeHistoryPaginator.ts
index 1ff7d3302cd2..951523db6f06 100644
--- a/clients/client-service-quotas/src/pagination/ListRequestedServiceQuotaChangeHistoryPaginator.ts
+++ b/clients/client-service-quotas/src/pagination/ListRequestedServiceQuotaChangeHistoryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRequestedServiceQuotaChangeHistory(
       throw new Error("Invalid client, expected ServiceQuotas | ServiceQuotasClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-quotas/src/pagination/ListServiceQuotaIncreaseRequestsInTemplatePaginator.ts b/clients/client-service-quotas/src/pagination/ListServiceQuotaIncreaseRequestsInTemplatePaginator.ts
index 036142bdddaa..9388cfaf59e8 100644
--- a/clients/client-service-quotas/src/pagination/ListServiceQuotaIncreaseRequestsInTemplatePaginator.ts
+++ b/clients/client-service-quotas/src/pagination/ListServiceQuotaIncreaseRequestsInTemplatePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListServiceQuotaIncreaseRequestsInTemplate(
       throw new Error("Invalid client, expected ServiceQuotas | ServiceQuotasClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-quotas/src/pagination/ListServiceQuotasPaginator.ts b/clients/client-service-quotas/src/pagination/ListServiceQuotasPaginator.ts
index 38ae147ca7a5..24ad7c107044 100644
--- a/clients/client-service-quotas/src/pagination/ListServiceQuotasPaginator.ts
+++ b/clients/client-service-quotas/src/pagination/ListServiceQuotasPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListServiceQuotas(
       throw new Error("Invalid client, expected ServiceQuotas | ServiceQuotasClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-service-quotas/src/pagination/ListServicesPaginator.ts b/clients/client-service-quotas/src/pagination/ListServicesPaginator.ts
index 252900c240ca..021fcf97dc49 100644
--- a/clients/client-service-quotas/src/pagination/ListServicesPaginator.ts
+++ b/clients/client-service-quotas/src/pagination/ListServicesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListServices(
       throw new Error("Invalid client, expected ServiceQuotas | ServiceQuotasClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-servicediscovery/src/pagination/GetInstancesHealthStatusPaginator.ts b/clients/client-servicediscovery/src/pagination/GetInstancesHealthStatusPaginator.ts
index 5aec41d33803..43a2c16284cb 100644
--- a/clients/client-servicediscovery/src/pagination/GetInstancesHealthStatusPaginator.ts
+++ b/clients/client-servicediscovery/src/pagination/GetInstancesHealthStatusPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetInstancesHealthStatus(
       throw new Error("Invalid client, expected ServiceDiscovery | ServiceDiscoveryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-servicediscovery/src/pagination/ListInstancesPaginator.ts b/clients/client-servicediscovery/src/pagination/ListInstancesPaginator.ts
index e4ca102bc6b8..df633ec1a4e4 100644
--- a/clients/client-servicediscovery/src/pagination/ListInstancesPaginator.ts
+++ b/clients/client-servicediscovery/src/pagination/ListInstancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListInstances(
       throw new Error("Invalid client, expected ServiceDiscovery | ServiceDiscoveryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-servicediscovery/src/pagination/ListNamespacesPaginator.ts b/clients/client-servicediscovery/src/pagination/ListNamespacesPaginator.ts
index f3d4a342e510..9f5f87fa22cf 100644
--- a/clients/client-servicediscovery/src/pagination/ListNamespacesPaginator.ts
+++ b/clients/client-servicediscovery/src/pagination/ListNamespacesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListNamespaces(
       throw new Error("Invalid client, expected ServiceDiscovery | ServiceDiscoveryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-servicediscovery/src/pagination/ListOperationsPaginator.ts b/clients/client-servicediscovery/src/pagination/ListOperationsPaginator.ts
index 49d48bc1e724..5faa33271778 100644
--- a/clients/client-servicediscovery/src/pagination/ListOperationsPaginator.ts
+++ b/clients/client-servicediscovery/src/pagination/ListOperationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListOperations(
       throw new Error("Invalid client, expected ServiceDiscovery | ServiceDiscoveryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-servicediscovery/src/pagination/ListServicesPaginator.ts b/clients/client-servicediscovery/src/pagination/ListServicesPaginator.ts
index 8fc0251a3da5..d09b0cd676ba 100644
--- a/clients/client-servicediscovery/src/pagination/ListServicesPaginator.ts
+++ b/clients/client-servicediscovery/src/pagination/ListServicesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListServices(
       throw new Error("Invalid client, expected ServiceDiscovery | ServiceDiscoveryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ses/src/pagination/ListCustomVerificationEmailTemplatesPaginator.ts b/clients/client-ses/src/pagination/ListCustomVerificationEmailTemplatesPaginator.ts
index 0782fa3a2a5f..319ba2ce4131 100644
--- a/clients/client-ses/src/pagination/ListCustomVerificationEmailTemplatesPaginator.ts
+++ b/clients/client-ses/src/pagination/ListCustomVerificationEmailTemplatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCustomVerificationEmailTemplates(
       throw new Error("Invalid client, expected SES | SESClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ses/src/pagination/ListIdentitiesPaginator.ts b/clients/client-ses/src/pagination/ListIdentitiesPaginator.ts
index be4cf4bb9c9a..02888f4e3b46 100644
--- a/clients/client-ses/src/pagination/ListIdentitiesPaginator.ts
+++ b/clients/client-ses/src/pagination/ListIdentitiesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListIdentities(
       throw new Error("Invalid client, expected SES | SESClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sesv2/src/pagination/GetDedicatedIpsPaginator.ts b/clients/client-sesv2/src/pagination/GetDedicatedIpsPaginator.ts
index 902f5422d4af..8155c46e4292 100644
--- a/clients/client-sesv2/src/pagination/GetDedicatedIpsPaginator.ts
+++ b/clients/client-sesv2/src/pagination/GetDedicatedIpsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetDedicatedIps(
       throw new Error("Invalid client, expected SESv2 | SESv2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sesv2/src/pagination/ListConfigurationSetsPaginator.ts b/clients/client-sesv2/src/pagination/ListConfigurationSetsPaginator.ts
index d202b250dd73..8e6ad48ce1a2 100644
--- a/clients/client-sesv2/src/pagination/ListConfigurationSetsPaginator.ts
+++ b/clients/client-sesv2/src/pagination/ListConfigurationSetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListConfigurationSets(
       throw new Error("Invalid client, expected SESv2 | SESv2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sesv2/src/pagination/ListContactListsPaginator.ts b/clients/client-sesv2/src/pagination/ListContactListsPaginator.ts
index 35fea955025e..4dcb731ab423 100644
--- a/clients/client-sesv2/src/pagination/ListContactListsPaginator.ts
+++ b/clients/client-sesv2/src/pagination/ListContactListsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListContactLists(
       throw new Error("Invalid client, expected SESv2 | SESv2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sesv2/src/pagination/ListContactsPaginator.ts b/clients/client-sesv2/src/pagination/ListContactsPaginator.ts
index 864b0b0603c4..527040540708 100644
--- a/clients/client-sesv2/src/pagination/ListContactsPaginator.ts
+++ b/clients/client-sesv2/src/pagination/ListContactsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListContacts(
       throw new Error("Invalid client, expected SESv2 | SESv2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sesv2/src/pagination/ListCustomVerificationEmailTemplatesPaginator.ts b/clients/client-sesv2/src/pagination/ListCustomVerificationEmailTemplatesPaginator.ts
index b722f8dd16e4..35994c52486f 100644
--- a/clients/client-sesv2/src/pagination/ListCustomVerificationEmailTemplatesPaginator.ts
+++ b/clients/client-sesv2/src/pagination/ListCustomVerificationEmailTemplatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCustomVerificationEmailTemplates(
       throw new Error("Invalid client, expected SESv2 | SESv2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sesv2/src/pagination/ListDedicatedIpPoolsPaginator.ts b/clients/client-sesv2/src/pagination/ListDedicatedIpPoolsPaginator.ts
index 7425f1c0b812..182ba1c46ce0 100644
--- a/clients/client-sesv2/src/pagination/ListDedicatedIpPoolsPaginator.ts
+++ b/clients/client-sesv2/src/pagination/ListDedicatedIpPoolsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDedicatedIpPools(
       throw new Error("Invalid client, expected SESv2 | SESv2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sesv2/src/pagination/ListDeliverabilityTestReportsPaginator.ts b/clients/client-sesv2/src/pagination/ListDeliverabilityTestReportsPaginator.ts
index c334daed96c2..f7d00b23ae59 100644
--- a/clients/client-sesv2/src/pagination/ListDeliverabilityTestReportsPaginator.ts
+++ b/clients/client-sesv2/src/pagination/ListDeliverabilityTestReportsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDeliverabilityTestReports(
       throw new Error("Invalid client, expected SESv2 | SESv2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sesv2/src/pagination/ListDomainDeliverabilityCampaignsPaginator.ts b/clients/client-sesv2/src/pagination/ListDomainDeliverabilityCampaignsPaginator.ts
index a15963da481b..80f6e37927ff 100644
--- a/clients/client-sesv2/src/pagination/ListDomainDeliverabilityCampaignsPaginator.ts
+++ b/clients/client-sesv2/src/pagination/ListDomainDeliverabilityCampaignsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDomainDeliverabilityCampaigns(
       throw new Error("Invalid client, expected SESv2 | SESv2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sesv2/src/pagination/ListEmailIdentitiesPaginator.ts b/clients/client-sesv2/src/pagination/ListEmailIdentitiesPaginator.ts
index b565742f0e41..83914819c8cb 100644
--- a/clients/client-sesv2/src/pagination/ListEmailIdentitiesPaginator.ts
+++ b/clients/client-sesv2/src/pagination/ListEmailIdentitiesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEmailIdentities(
       throw new Error("Invalid client, expected SESv2 | SESv2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sesv2/src/pagination/ListEmailTemplatesPaginator.ts b/clients/client-sesv2/src/pagination/ListEmailTemplatesPaginator.ts
index fff866e624d0..008423a1086b 100644
--- a/clients/client-sesv2/src/pagination/ListEmailTemplatesPaginator.ts
+++ b/clients/client-sesv2/src/pagination/ListEmailTemplatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEmailTemplates(
       throw new Error("Invalid client, expected SESv2 | SESv2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sesv2/src/pagination/ListImportJobsPaginator.ts b/clients/client-sesv2/src/pagination/ListImportJobsPaginator.ts
index c7f5ef6f3d10..2855981b306e 100644
--- a/clients/client-sesv2/src/pagination/ListImportJobsPaginator.ts
+++ b/clients/client-sesv2/src/pagination/ListImportJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListImportJobs(
       throw new Error("Invalid client, expected SESv2 | SESv2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sesv2/src/pagination/ListSuppressedDestinationsPaginator.ts b/clients/client-sesv2/src/pagination/ListSuppressedDestinationsPaginator.ts
index c9e440a53c3c..55ccbe2f921b 100644
--- a/clients/client-sesv2/src/pagination/ListSuppressedDestinationsPaginator.ts
+++ b/clients/client-sesv2/src/pagination/ListSuppressedDestinationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSuppressedDestinations(
       throw new Error("Invalid client, expected SESv2 | SESv2Client");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sfn/src/pagination/GetExecutionHistoryPaginator.ts b/clients/client-sfn/src/pagination/GetExecutionHistoryPaginator.ts
index b07c5283069c..859d79be9fb1 100644
--- a/clients/client-sfn/src/pagination/GetExecutionHistoryPaginator.ts
+++ b/clients/client-sfn/src/pagination/GetExecutionHistoryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetExecutionHistory(
       throw new Error("Invalid client, expected SFN | SFNClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sfn/src/pagination/ListActivitiesPaginator.ts b/clients/client-sfn/src/pagination/ListActivitiesPaginator.ts
index 9459b55b1941..bc97076b1d70 100644
--- a/clients/client-sfn/src/pagination/ListActivitiesPaginator.ts
+++ b/clients/client-sfn/src/pagination/ListActivitiesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListActivities(
       throw new Error("Invalid client, expected SFN | SFNClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sfn/src/pagination/ListExecutionsPaginator.ts b/clients/client-sfn/src/pagination/ListExecutionsPaginator.ts
index 44d664fb74d2..379a1a82da13 100644
--- a/clients/client-sfn/src/pagination/ListExecutionsPaginator.ts
+++ b/clients/client-sfn/src/pagination/ListExecutionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListExecutions(
       throw new Error("Invalid client, expected SFN | SFNClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sfn/src/pagination/ListStateMachinesPaginator.ts b/clients/client-sfn/src/pagination/ListStateMachinesPaginator.ts
index 29979ff45d70..993ba2e6f24a 100644
--- a/clients/client-sfn/src/pagination/ListStateMachinesPaginator.ts
+++ b/clients/client-sfn/src/pagination/ListStateMachinesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListStateMachines(
       throw new Error("Invalid client, expected SFN | SFNClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-shield/src/pagination/ListAttacksPaginator.ts b/clients/client-shield/src/pagination/ListAttacksPaginator.ts
index f68f3f39f178..2328fc312888 100644
--- a/clients/client-shield/src/pagination/ListAttacksPaginator.ts
+++ b/clients/client-shield/src/pagination/ListAttacksPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListAttacks(
       throw new Error("Invalid client, expected Shield | ShieldClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-shield/src/pagination/ListProtectionGroupsPaginator.ts b/clients/client-shield/src/pagination/ListProtectionGroupsPaginator.ts
index a487049f39fd..53c7bc5ae1b8 100644
--- a/clients/client-shield/src/pagination/ListProtectionGroupsPaginator.ts
+++ b/clients/client-shield/src/pagination/ListProtectionGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListProtectionGroups(
       throw new Error("Invalid client, expected Shield | ShieldClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-shield/src/pagination/ListProtectionsPaginator.ts b/clients/client-shield/src/pagination/ListProtectionsPaginator.ts
index 298850175433..f4496d902b4e 100644
--- a/clients/client-shield/src/pagination/ListProtectionsPaginator.ts
+++ b/clients/client-shield/src/pagination/ListProtectionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListProtections(
       throw new Error("Invalid client, expected Shield | ShieldClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-shield/src/pagination/ListResourcesInProtectionGroupPaginator.ts b/clients/client-shield/src/pagination/ListResourcesInProtectionGroupPaginator.ts
index 781088c63134..1e812032e168 100644
--- a/clients/client-shield/src/pagination/ListResourcesInProtectionGroupPaginator.ts
+++ b/clients/client-shield/src/pagination/ListResourcesInProtectionGroupPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListResourcesInProtectionGroup(
       throw new Error("Invalid client, expected Shield | ShieldClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-signer/src/pagination/ListSigningJobsPaginator.ts b/clients/client-signer/src/pagination/ListSigningJobsPaginator.ts
index 3ec4bfeb0547..87b19ddd57ce 100644
--- a/clients/client-signer/src/pagination/ListSigningJobsPaginator.ts
+++ b/clients/client-signer/src/pagination/ListSigningJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSigningJobs(
       throw new Error("Invalid client, expected Signer | SignerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-signer/src/pagination/ListSigningPlatformsPaginator.ts b/clients/client-signer/src/pagination/ListSigningPlatformsPaginator.ts
index 49b70aef3ea5..951bb5cd8175 100644
--- a/clients/client-signer/src/pagination/ListSigningPlatformsPaginator.ts
+++ b/clients/client-signer/src/pagination/ListSigningPlatformsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSigningPlatforms(
       throw new Error("Invalid client, expected Signer | SignerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-signer/src/pagination/ListSigningProfilesPaginator.ts b/clients/client-signer/src/pagination/ListSigningProfilesPaginator.ts
index 727274e4b12d..de37fbf0bb55 100644
--- a/clients/client-signer/src/pagination/ListSigningProfilesPaginator.ts
+++ b/clients/client-signer/src/pagination/ListSigningProfilesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSigningProfiles(
       throw new Error("Invalid client, expected Signer | SignerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sms/src/pagination/GetConnectorsPaginator.ts b/clients/client-sms/src/pagination/GetConnectorsPaginator.ts
index 10b9a204baf4..4b768f4d9c15 100644
--- a/clients/client-sms/src/pagination/GetConnectorsPaginator.ts
+++ b/clients/client-sms/src/pagination/GetConnectorsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetConnectors(
       throw new Error("Invalid client, expected SMS | SMSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sms/src/pagination/GetReplicationJobsPaginator.ts b/clients/client-sms/src/pagination/GetReplicationJobsPaginator.ts
index c4653f24be8c..8f9180292ce9 100644
--- a/clients/client-sms/src/pagination/GetReplicationJobsPaginator.ts
+++ b/clients/client-sms/src/pagination/GetReplicationJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetReplicationJobs(
       throw new Error("Invalid client, expected SMS | SMSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sms/src/pagination/GetReplicationRunsPaginator.ts b/clients/client-sms/src/pagination/GetReplicationRunsPaginator.ts
index c1d42cc5d4be..f19d729a63c8 100644
--- a/clients/client-sms/src/pagination/GetReplicationRunsPaginator.ts
+++ b/clients/client-sms/src/pagination/GetReplicationRunsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetReplicationRuns(
       throw new Error("Invalid client, expected SMS | SMSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sms/src/pagination/GetServersPaginator.ts b/clients/client-sms/src/pagination/GetServersPaginator.ts
index f5fed42b0baa..ae4b8be74ab2 100644
--- a/clients/client-sms/src/pagination/GetServersPaginator.ts
+++ b/clients/client-sms/src/pagination/GetServersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateGetServers(
       throw new Error("Invalid client, expected SMS | SMSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-snow-device-management/src/pagination/ListDeviceResourcesPaginator.ts b/clients/client-snow-device-management/src/pagination/ListDeviceResourcesPaginator.ts
index 6d6f75640d6e..976298f60423 100644
--- a/clients/client-snow-device-management/src/pagination/ListDeviceResourcesPaginator.ts
+++ b/clients/client-snow-device-management/src/pagination/ListDeviceResourcesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDeviceResources(
       throw new Error("Invalid client, expected SnowDeviceManagement | SnowDeviceManagementClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-snow-device-management/src/pagination/ListDevicesPaginator.ts b/clients/client-snow-device-management/src/pagination/ListDevicesPaginator.ts
index 97d6742d4e04..0a41bfbb7b71 100644
--- a/clients/client-snow-device-management/src/pagination/ListDevicesPaginator.ts
+++ b/clients/client-snow-device-management/src/pagination/ListDevicesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListDevices(
       throw new Error("Invalid client, expected SnowDeviceManagement | SnowDeviceManagementClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-snow-device-management/src/pagination/ListExecutionsPaginator.ts b/clients/client-snow-device-management/src/pagination/ListExecutionsPaginator.ts
index a7363c87a64a..05c9ee81a09e 100644
--- a/clients/client-snow-device-management/src/pagination/ListExecutionsPaginator.ts
+++ b/clients/client-snow-device-management/src/pagination/ListExecutionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListExecutions(
       throw new Error("Invalid client, expected SnowDeviceManagement | SnowDeviceManagementClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-snow-device-management/src/pagination/ListTasksPaginator.ts b/clients/client-snow-device-management/src/pagination/ListTasksPaginator.ts
index ccc451828fcf..ee6dcec812f5 100644
--- a/clients/client-snow-device-management/src/pagination/ListTasksPaginator.ts
+++ b/clients/client-snow-device-management/src/pagination/ListTasksPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListTasks(
       throw new Error("Invalid client, expected SnowDeviceManagement | SnowDeviceManagementClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-snowball/src/pagination/DescribeAddressesPaginator.ts b/clients/client-snowball/src/pagination/DescribeAddressesPaginator.ts
index b0825113c650..4a7be4ba9de3 100644
--- a/clients/client-snowball/src/pagination/DescribeAddressesPaginator.ts
+++ b/clients/client-snowball/src/pagination/DescribeAddressesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeAddresses(
       throw new Error("Invalid client, expected Snowball | SnowballClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-snowball/src/pagination/ListJobsPaginator.ts b/clients/client-snowball/src/pagination/ListJobsPaginator.ts
index 9da7c16797f7..b0dc1239f1ac 100644
--- a/clients/client-snowball/src/pagination/ListJobsPaginator.ts
+++ b/clients/client-snowball/src/pagination/ListJobsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListJobs(
       throw new Error("Invalid client, expected Snowball | SnowballClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sns/src/pagination/ListEndpointsByPlatformApplicationPaginator.ts b/clients/client-sns/src/pagination/ListEndpointsByPlatformApplicationPaginator.ts
index db115b68976f..efb45bc3e1d7 100644
--- a/clients/client-sns/src/pagination/ListEndpointsByPlatformApplicationPaginator.ts
+++ b/clients/client-sns/src/pagination/ListEndpointsByPlatformApplicationPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListEndpointsByPlatformApplication(
       throw new Error("Invalid client, expected SNS | SNSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sns/src/pagination/ListOriginationNumbersPaginator.ts b/clients/client-sns/src/pagination/ListOriginationNumbersPaginator.ts
index a33b5a0b0772..d671bab936f2 100644
--- a/clients/client-sns/src/pagination/ListOriginationNumbersPaginator.ts
+++ b/clients/client-sns/src/pagination/ListOriginationNumbersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListOriginationNumbers(
       throw new Error("Invalid client, expected SNS | SNSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sns/src/pagination/ListPhoneNumbersOptedOutPaginator.ts b/clients/client-sns/src/pagination/ListPhoneNumbersOptedOutPaginator.ts
index b90269e12933..bbf2da7d5eb2 100644
--- a/clients/client-sns/src/pagination/ListPhoneNumbersOptedOutPaginator.ts
+++ b/clients/client-sns/src/pagination/ListPhoneNumbersOptedOutPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListPhoneNumbersOptedOut(
       throw new Error("Invalid client, expected SNS | SNSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sns/src/pagination/ListPlatformApplicationsPaginator.ts b/clients/client-sns/src/pagination/ListPlatformApplicationsPaginator.ts
index b9032bdf7bb5..ce424b53526f 100644
--- a/clients/client-sns/src/pagination/ListPlatformApplicationsPaginator.ts
+++ b/clients/client-sns/src/pagination/ListPlatformApplicationsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListPlatformApplications(
       throw new Error("Invalid client, expected SNS | SNSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sns/src/pagination/ListSMSSandboxPhoneNumbersPaginator.ts b/clients/client-sns/src/pagination/ListSMSSandboxPhoneNumbersPaginator.ts
index 35da4e30df0e..4b9e04cbbf52 100644
--- a/clients/client-sns/src/pagination/ListSMSSandboxPhoneNumbersPaginator.ts
+++ b/clients/client-sns/src/pagination/ListSMSSandboxPhoneNumbersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSMSSandboxPhoneNumbers(
       throw new Error("Invalid client, expected SNS | SNSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sns/src/pagination/ListSubscriptionsByTopicPaginator.ts b/clients/client-sns/src/pagination/ListSubscriptionsByTopicPaginator.ts
index 1455b3c42dc2..05ace70f8142 100644
--- a/clients/client-sns/src/pagination/ListSubscriptionsByTopicPaginator.ts
+++ b/clients/client-sns/src/pagination/ListSubscriptionsByTopicPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListSubscriptionsByTopic(
       throw new Error("Invalid client, expected SNS | SNSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sns/src/pagination/ListSubscriptionsPaginator.ts b/clients/client-sns/src/pagination/ListSubscriptionsPaginator.ts
index 8954d4e028e2..9a1204398b88 100644
--- a/clients/client-sns/src/pagination/ListSubscriptionsPaginator.ts
+++ b/clients/client-sns/src/pagination/ListSubscriptionsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListSubscriptions(
       throw new Error("Invalid client, expected SNS | SNSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sns/src/pagination/ListTopicsPaginator.ts b/clients/client-sns/src/pagination/ListTopicsPaginator.ts
index 3ed61ed33af5..0bc824842b22 100644
--- a/clients/client-sns/src/pagination/ListTopicsPaginator.ts
+++ b/clients/client-sns/src/pagination/ListTopicsPaginator.ts
@@ -46,8 +46,9 @@ export async function* paginateListTopics(
       throw new Error("Invalid client, expected SNS | SNSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sqs/src/pagination/ListDeadLetterSourceQueuesPaginator.ts b/clients/client-sqs/src/pagination/ListDeadLetterSourceQueuesPaginator.ts
index 805a9e233056..a4481aad4462 100644
--- a/clients/client-sqs/src/pagination/ListDeadLetterSourceQueuesPaginator.ts
+++ b/clients/client-sqs/src/pagination/ListDeadLetterSourceQueuesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDeadLetterSourceQueues(
       throw new Error("Invalid client, expected SQS | SQSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sqs/src/pagination/ListQueuesPaginator.ts b/clients/client-sqs/src/pagination/ListQueuesPaginator.ts
index 1ecaacff7762..7eff7bc968e1 100644
--- a/clients/client-sqs/src/pagination/ListQueuesPaginator.ts
+++ b/clients/client-sqs/src/pagination/ListQueuesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListQueues(
       throw new Error("Invalid client, expected SQS | SQSClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm-contacts/src/pagination/ListContactChannelsPaginator.ts b/clients/client-ssm-contacts/src/pagination/ListContactChannelsPaginator.ts
index 82d84bbaf1a2..503ab80f41c0 100644
--- a/clients/client-ssm-contacts/src/pagination/ListContactChannelsPaginator.ts
+++ b/clients/client-ssm-contacts/src/pagination/ListContactChannelsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListContactChannels(
       throw new Error("Invalid client, expected SSMContacts | SSMContactsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm-contacts/src/pagination/ListContactsPaginator.ts b/clients/client-ssm-contacts/src/pagination/ListContactsPaginator.ts
index 465975ae9f29..2166c5d884f3 100644
--- a/clients/client-ssm-contacts/src/pagination/ListContactsPaginator.ts
+++ b/clients/client-ssm-contacts/src/pagination/ListContactsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListContacts(
       throw new Error("Invalid client, expected SSMContacts | SSMContactsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm-contacts/src/pagination/ListEngagementsPaginator.ts b/clients/client-ssm-contacts/src/pagination/ListEngagementsPaginator.ts
index 199ba934a18c..0fc6310dd909 100644
--- a/clients/client-ssm-contacts/src/pagination/ListEngagementsPaginator.ts
+++ b/clients/client-ssm-contacts/src/pagination/ListEngagementsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListEngagements(
       throw new Error("Invalid client, expected SSMContacts | SSMContactsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm-contacts/src/pagination/ListPageReceiptsPaginator.ts b/clients/client-ssm-contacts/src/pagination/ListPageReceiptsPaginator.ts
index 23e31ad5f203..226983e7c2b4 100644
--- a/clients/client-ssm-contacts/src/pagination/ListPageReceiptsPaginator.ts
+++ b/clients/client-ssm-contacts/src/pagination/ListPageReceiptsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPageReceipts(
       throw new Error("Invalid client, expected SSMContacts | SSMContactsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm-contacts/src/pagination/ListPagesByContactPaginator.ts b/clients/client-ssm-contacts/src/pagination/ListPagesByContactPaginator.ts
index 5950ac34b7bf..614fc4b6708c 100644
--- a/clients/client-ssm-contacts/src/pagination/ListPagesByContactPaginator.ts
+++ b/clients/client-ssm-contacts/src/pagination/ListPagesByContactPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPagesByContact(
       throw new Error("Invalid client, expected SSMContacts | SSMContactsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm-contacts/src/pagination/ListPagesByEngagementPaginator.ts b/clients/client-ssm-contacts/src/pagination/ListPagesByEngagementPaginator.ts
index 8d4dc2cec326..dc6c00928dbc 100644
--- a/clients/client-ssm-contacts/src/pagination/ListPagesByEngagementPaginator.ts
+++ b/clients/client-ssm-contacts/src/pagination/ListPagesByEngagementPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPagesByEngagement(
       throw new Error("Invalid client, expected SSMContacts | SSMContactsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm-incidents/src/pagination/GetResourcePoliciesPaginator.ts b/clients/client-ssm-incidents/src/pagination/GetResourcePoliciesPaginator.ts
index 80f4bc77162f..9c14dacf5d49 100644
--- a/clients/client-ssm-incidents/src/pagination/GetResourcePoliciesPaginator.ts
+++ b/clients/client-ssm-incidents/src/pagination/GetResourcePoliciesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetResourcePolicies(
       throw new Error("Invalid client, expected SSMIncidents | SSMIncidentsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm-incidents/src/pagination/ListIncidentRecordsPaginator.ts b/clients/client-ssm-incidents/src/pagination/ListIncidentRecordsPaginator.ts
index 97b943953cf3..4312276fa485 100644
--- a/clients/client-ssm-incidents/src/pagination/ListIncidentRecordsPaginator.ts
+++ b/clients/client-ssm-incidents/src/pagination/ListIncidentRecordsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListIncidentRecords(
       throw new Error("Invalid client, expected SSMIncidents | SSMIncidentsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm-incidents/src/pagination/ListRelatedItemsPaginator.ts b/clients/client-ssm-incidents/src/pagination/ListRelatedItemsPaginator.ts
index 36f0fa8bfd2b..593c00ffa2c1 100644
--- a/clients/client-ssm-incidents/src/pagination/ListRelatedItemsPaginator.ts
+++ b/clients/client-ssm-incidents/src/pagination/ListRelatedItemsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListRelatedItems(
       throw new Error("Invalid client, expected SSMIncidents | SSMIncidentsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm-incidents/src/pagination/ListReplicationSetsPaginator.ts b/clients/client-ssm-incidents/src/pagination/ListReplicationSetsPaginator.ts
index bae15a8ee4f8..8a9f37277452 100644
--- a/clients/client-ssm-incidents/src/pagination/ListReplicationSetsPaginator.ts
+++ b/clients/client-ssm-incidents/src/pagination/ListReplicationSetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListReplicationSets(
       throw new Error("Invalid client, expected SSMIncidents | SSMIncidentsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm-incidents/src/pagination/ListResponsePlansPaginator.ts b/clients/client-ssm-incidents/src/pagination/ListResponsePlansPaginator.ts
index 89b7f3f64dc0..c9fb9c39c8b9 100644
--- a/clients/client-ssm-incidents/src/pagination/ListResponsePlansPaginator.ts
+++ b/clients/client-ssm-incidents/src/pagination/ListResponsePlansPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListResponsePlans(
       throw new Error("Invalid client, expected SSMIncidents | SSMIncidentsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm-incidents/src/pagination/ListTimelineEventsPaginator.ts b/clients/client-ssm-incidents/src/pagination/ListTimelineEventsPaginator.ts
index 08d4fa30289d..8f0b389be69b 100644
--- a/clients/client-ssm-incidents/src/pagination/ListTimelineEventsPaginator.ts
+++ b/clients/client-ssm-incidents/src/pagination/ListTimelineEventsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTimelineEvents(
       throw new Error("Invalid client, expected SSMIncidents | SSMIncidentsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/DescribeActivationsPaginator.ts b/clients/client-ssm/src/pagination/DescribeActivationsPaginator.ts
index baee2724f026..1097e676433a 100644
--- a/clients/client-ssm/src/pagination/DescribeActivationsPaginator.ts
+++ b/clients/client-ssm/src/pagination/DescribeActivationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeActivations(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/DescribeAssociationExecutionTargetsPaginator.ts b/clients/client-ssm/src/pagination/DescribeAssociationExecutionTargetsPaginator.ts
index cea084a3e7b2..3d2e1a32e9d4 100644
--- a/clients/client-ssm/src/pagination/DescribeAssociationExecutionTargetsPaginator.ts
+++ b/clients/client-ssm/src/pagination/DescribeAssociationExecutionTargetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeAssociationExecutionTargets(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/DescribeAssociationExecutionsPaginator.ts b/clients/client-ssm/src/pagination/DescribeAssociationExecutionsPaginator.ts
index b21dd6868a77..76b6b4818faa 100644
--- a/clients/client-ssm/src/pagination/DescribeAssociationExecutionsPaginator.ts
+++ b/clients/client-ssm/src/pagination/DescribeAssociationExecutionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeAssociationExecutions(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/DescribeAutomationExecutionsPaginator.ts b/clients/client-ssm/src/pagination/DescribeAutomationExecutionsPaginator.ts
index 89efb925d44e..c24557016ea1 100644
--- a/clients/client-ssm/src/pagination/DescribeAutomationExecutionsPaginator.ts
+++ b/clients/client-ssm/src/pagination/DescribeAutomationExecutionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeAutomationExecutions(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/DescribeAutomationStepExecutionsPaginator.ts b/clients/client-ssm/src/pagination/DescribeAutomationStepExecutionsPaginator.ts
index e0a42a6c022a..92a455e8e43f 100644
--- a/clients/client-ssm/src/pagination/DescribeAutomationStepExecutionsPaginator.ts
+++ b/clients/client-ssm/src/pagination/DescribeAutomationStepExecutionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeAutomationStepExecutions(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/DescribeAvailablePatchesPaginator.ts b/clients/client-ssm/src/pagination/DescribeAvailablePatchesPaginator.ts
index f35c93cc1e6f..bdee209a2d1e 100644
--- a/clients/client-ssm/src/pagination/DescribeAvailablePatchesPaginator.ts
+++ b/clients/client-ssm/src/pagination/DescribeAvailablePatchesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeAvailablePatches(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/DescribeEffectiveInstanceAssociationsPaginator.ts b/clients/client-ssm/src/pagination/DescribeEffectiveInstanceAssociationsPaginator.ts
index 5c16988b516a..4a1527ef5916 100644
--- a/clients/client-ssm/src/pagination/DescribeEffectiveInstanceAssociationsPaginator.ts
+++ b/clients/client-ssm/src/pagination/DescribeEffectiveInstanceAssociationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEffectiveInstanceAssociations(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/DescribeEffectivePatchesForPatchBaselinePaginator.ts b/clients/client-ssm/src/pagination/DescribeEffectivePatchesForPatchBaselinePaginator.ts
index e0cfaf0768b8..24296f3afd3d 100644
--- a/clients/client-ssm/src/pagination/DescribeEffectivePatchesForPatchBaselinePaginator.ts
+++ b/clients/client-ssm/src/pagination/DescribeEffectivePatchesForPatchBaselinePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeEffectivePatchesForPatchBaseline(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/DescribeInstanceAssociationsStatusPaginator.ts b/clients/client-ssm/src/pagination/DescribeInstanceAssociationsStatusPaginator.ts
index 0ebaf29d6d5a..381b9e7fa577 100644
--- a/clients/client-ssm/src/pagination/DescribeInstanceAssociationsStatusPaginator.ts
+++ b/clients/client-ssm/src/pagination/DescribeInstanceAssociationsStatusPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeInstanceAssociationsStatus(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/DescribeInstanceInformationPaginator.ts b/clients/client-ssm/src/pagination/DescribeInstanceInformationPaginator.ts
index de5cfbf9caf1..c40167e30e4c 100644
--- a/clients/client-ssm/src/pagination/DescribeInstanceInformationPaginator.ts
+++ b/clients/client-ssm/src/pagination/DescribeInstanceInformationPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeInstanceInformation(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/DescribeInstancePatchStatesForPatchGroupPaginator.ts b/clients/client-ssm/src/pagination/DescribeInstancePatchStatesForPatchGroupPaginator.ts
index 3ee026aeb1c1..7dc09904eb22 100644
--- a/clients/client-ssm/src/pagination/DescribeInstancePatchStatesForPatchGroupPaginator.ts
+++ b/clients/client-ssm/src/pagination/DescribeInstancePatchStatesForPatchGroupPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeInstancePatchStatesForPatchGroup(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/DescribeInstancePatchStatesPaginator.ts b/clients/client-ssm/src/pagination/DescribeInstancePatchStatesPaginator.ts
index a80e5b97ec45..ffa7b73d7f77 100644
--- a/clients/client-ssm/src/pagination/DescribeInstancePatchStatesPaginator.ts
+++ b/clients/client-ssm/src/pagination/DescribeInstancePatchStatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeInstancePatchStates(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/DescribeInstancePatchesPaginator.ts b/clients/client-ssm/src/pagination/DescribeInstancePatchesPaginator.ts
index 4a761d61565b..3b175a30c389 100644
--- a/clients/client-ssm/src/pagination/DescribeInstancePatchesPaginator.ts
+++ b/clients/client-ssm/src/pagination/DescribeInstancePatchesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeInstancePatches(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/DescribeInventoryDeletionsPaginator.ts b/clients/client-ssm/src/pagination/DescribeInventoryDeletionsPaginator.ts
index 5f8f95b11f84..66a931dc0757 100644
--- a/clients/client-ssm/src/pagination/DescribeInventoryDeletionsPaginator.ts
+++ b/clients/client-ssm/src/pagination/DescribeInventoryDeletionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeInventoryDeletions(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/DescribeMaintenanceWindowExecutionTaskInvocationsPaginator.ts b/clients/client-ssm/src/pagination/DescribeMaintenanceWindowExecutionTaskInvocationsPaginator.ts
index 2fb4f8e8a226..86c97b872693 100644
--- a/clients/client-ssm/src/pagination/DescribeMaintenanceWindowExecutionTaskInvocationsPaginator.ts
+++ b/clients/client-ssm/src/pagination/DescribeMaintenanceWindowExecutionTaskInvocationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeMaintenanceWindowExecutionTaskInvocations
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/DescribeMaintenanceWindowExecutionTasksPaginator.ts b/clients/client-ssm/src/pagination/DescribeMaintenanceWindowExecutionTasksPaginator.ts
index 72b9d119211f..184991dac283 100644
--- a/clients/client-ssm/src/pagination/DescribeMaintenanceWindowExecutionTasksPaginator.ts
+++ b/clients/client-ssm/src/pagination/DescribeMaintenanceWindowExecutionTasksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeMaintenanceWindowExecutionTasks(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/DescribeMaintenanceWindowExecutionsPaginator.ts b/clients/client-ssm/src/pagination/DescribeMaintenanceWindowExecutionsPaginator.ts
index cb7fcbd167c8..aac1e521241b 100644
--- a/clients/client-ssm/src/pagination/DescribeMaintenanceWindowExecutionsPaginator.ts
+++ b/clients/client-ssm/src/pagination/DescribeMaintenanceWindowExecutionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeMaintenanceWindowExecutions(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/DescribeMaintenanceWindowSchedulePaginator.ts b/clients/client-ssm/src/pagination/DescribeMaintenanceWindowSchedulePaginator.ts
index 67efd1f6ecc2..c862d53e9331 100644
--- a/clients/client-ssm/src/pagination/DescribeMaintenanceWindowSchedulePaginator.ts
+++ b/clients/client-ssm/src/pagination/DescribeMaintenanceWindowSchedulePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeMaintenanceWindowSchedule(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/DescribeMaintenanceWindowTargetsPaginator.ts b/clients/client-ssm/src/pagination/DescribeMaintenanceWindowTargetsPaginator.ts
index 2afb83042376..7c0618a1d2da 100644
--- a/clients/client-ssm/src/pagination/DescribeMaintenanceWindowTargetsPaginator.ts
+++ b/clients/client-ssm/src/pagination/DescribeMaintenanceWindowTargetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeMaintenanceWindowTargets(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/DescribeMaintenanceWindowTasksPaginator.ts b/clients/client-ssm/src/pagination/DescribeMaintenanceWindowTasksPaginator.ts
index 40f5920043c0..aa30eb2d3883 100644
--- a/clients/client-ssm/src/pagination/DescribeMaintenanceWindowTasksPaginator.ts
+++ b/clients/client-ssm/src/pagination/DescribeMaintenanceWindowTasksPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeMaintenanceWindowTasks(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/DescribeMaintenanceWindowsForTargetPaginator.ts b/clients/client-ssm/src/pagination/DescribeMaintenanceWindowsForTargetPaginator.ts
index f80d4344df2f..24fe2a40857a 100644
--- a/clients/client-ssm/src/pagination/DescribeMaintenanceWindowsForTargetPaginator.ts
+++ b/clients/client-ssm/src/pagination/DescribeMaintenanceWindowsForTargetPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeMaintenanceWindowsForTarget(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/DescribeMaintenanceWindowsPaginator.ts b/clients/client-ssm/src/pagination/DescribeMaintenanceWindowsPaginator.ts
index 1a3f1cbb7678..bca5bfea26f9 100644
--- a/clients/client-ssm/src/pagination/DescribeMaintenanceWindowsPaginator.ts
+++ b/clients/client-ssm/src/pagination/DescribeMaintenanceWindowsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeMaintenanceWindows(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/DescribeOpsItemsPaginator.ts b/clients/client-ssm/src/pagination/DescribeOpsItemsPaginator.ts
index ff7489b117af..ccb580b0fa14 100644
--- a/clients/client-ssm/src/pagination/DescribeOpsItemsPaginator.ts
+++ b/clients/client-ssm/src/pagination/DescribeOpsItemsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeOpsItems(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/DescribeParametersPaginator.ts b/clients/client-ssm/src/pagination/DescribeParametersPaginator.ts
index 8c185eda261f..c1dd15997386 100644
--- a/clients/client-ssm/src/pagination/DescribeParametersPaginator.ts
+++ b/clients/client-ssm/src/pagination/DescribeParametersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeParameters(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/DescribePatchBaselinesPaginator.ts b/clients/client-ssm/src/pagination/DescribePatchBaselinesPaginator.ts
index 277506e760d8..fa3bc493988f 100644
--- a/clients/client-ssm/src/pagination/DescribePatchBaselinesPaginator.ts
+++ b/clients/client-ssm/src/pagination/DescribePatchBaselinesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribePatchBaselines(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/DescribePatchGroupsPaginator.ts b/clients/client-ssm/src/pagination/DescribePatchGroupsPaginator.ts
index e141f57fbf79..5509b42733e2 100644
--- a/clients/client-ssm/src/pagination/DescribePatchGroupsPaginator.ts
+++ b/clients/client-ssm/src/pagination/DescribePatchGroupsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribePatchGroups(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/DescribePatchPropertiesPaginator.ts b/clients/client-ssm/src/pagination/DescribePatchPropertiesPaginator.ts
index df5b1ee76788..aa23739c3559 100644
--- a/clients/client-ssm/src/pagination/DescribePatchPropertiesPaginator.ts
+++ b/clients/client-ssm/src/pagination/DescribePatchPropertiesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribePatchProperties(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/DescribeSessionsPaginator.ts b/clients/client-ssm/src/pagination/DescribeSessionsPaginator.ts
index fc0e3214ffb4..d45a0f2a2a67 100644
--- a/clients/client-ssm/src/pagination/DescribeSessionsPaginator.ts
+++ b/clients/client-ssm/src/pagination/DescribeSessionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeSessions(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/GetInventoryPaginator.ts b/clients/client-ssm/src/pagination/GetInventoryPaginator.ts
index 2587d2d29b35..f32dee6b34b7 100644
--- a/clients/client-ssm/src/pagination/GetInventoryPaginator.ts
+++ b/clients/client-ssm/src/pagination/GetInventoryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetInventory(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/GetInventorySchemaPaginator.ts b/clients/client-ssm/src/pagination/GetInventorySchemaPaginator.ts
index 6402bf73f3b1..ec95cc058e7a 100644
--- a/clients/client-ssm/src/pagination/GetInventorySchemaPaginator.ts
+++ b/clients/client-ssm/src/pagination/GetInventorySchemaPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetInventorySchema(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/GetOpsSummaryPaginator.ts b/clients/client-ssm/src/pagination/GetOpsSummaryPaginator.ts
index ac2f796e7b27..2e4bc05e15c3 100644
--- a/clients/client-ssm/src/pagination/GetOpsSummaryPaginator.ts
+++ b/clients/client-ssm/src/pagination/GetOpsSummaryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetOpsSummary(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/GetParameterHistoryPaginator.ts b/clients/client-ssm/src/pagination/GetParameterHistoryPaginator.ts
index bd452a00e7b0..795cf7443156 100644
--- a/clients/client-ssm/src/pagination/GetParameterHistoryPaginator.ts
+++ b/clients/client-ssm/src/pagination/GetParameterHistoryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetParameterHistory(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/GetParametersByPathPaginator.ts b/clients/client-ssm/src/pagination/GetParametersByPathPaginator.ts
index 3a4413cafa79..7906ad100dea 100644
--- a/clients/client-ssm/src/pagination/GetParametersByPathPaginator.ts
+++ b/clients/client-ssm/src/pagination/GetParametersByPathPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetParametersByPath(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/ListAssociationVersionsPaginator.ts b/clients/client-ssm/src/pagination/ListAssociationVersionsPaginator.ts
index cfe39d16c0e1..c4a5822fd7ee 100644
--- a/clients/client-ssm/src/pagination/ListAssociationVersionsPaginator.ts
+++ b/clients/client-ssm/src/pagination/ListAssociationVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAssociationVersions(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/ListAssociationsPaginator.ts b/clients/client-ssm/src/pagination/ListAssociationsPaginator.ts
index b0891f6c7689..c570b2a80646 100644
--- a/clients/client-ssm/src/pagination/ListAssociationsPaginator.ts
+++ b/clients/client-ssm/src/pagination/ListAssociationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAssociations(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/ListCommandInvocationsPaginator.ts b/clients/client-ssm/src/pagination/ListCommandInvocationsPaginator.ts
index 1aa4257c03b6..5cae1a96952a 100644
--- a/clients/client-ssm/src/pagination/ListCommandInvocationsPaginator.ts
+++ b/clients/client-ssm/src/pagination/ListCommandInvocationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCommandInvocations(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/ListCommandsPaginator.ts b/clients/client-ssm/src/pagination/ListCommandsPaginator.ts
index 3c5f6f87e7d8..fb6172c28d7b 100644
--- a/clients/client-ssm/src/pagination/ListCommandsPaginator.ts
+++ b/clients/client-ssm/src/pagination/ListCommandsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCommands(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/ListComplianceItemsPaginator.ts b/clients/client-ssm/src/pagination/ListComplianceItemsPaginator.ts
index e54a694d9854..b2c66254ca77 100644
--- a/clients/client-ssm/src/pagination/ListComplianceItemsPaginator.ts
+++ b/clients/client-ssm/src/pagination/ListComplianceItemsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListComplianceItems(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/ListComplianceSummariesPaginator.ts b/clients/client-ssm/src/pagination/ListComplianceSummariesPaginator.ts
index b63fa526b1d0..e84eac8cdd8b 100644
--- a/clients/client-ssm/src/pagination/ListComplianceSummariesPaginator.ts
+++ b/clients/client-ssm/src/pagination/ListComplianceSummariesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListComplianceSummaries(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/ListDocumentVersionsPaginator.ts b/clients/client-ssm/src/pagination/ListDocumentVersionsPaginator.ts
index e4019a36a64e..d0bfa5f49f56 100644
--- a/clients/client-ssm/src/pagination/ListDocumentVersionsPaginator.ts
+++ b/clients/client-ssm/src/pagination/ListDocumentVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDocumentVersions(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/ListDocumentsPaginator.ts b/clients/client-ssm/src/pagination/ListDocumentsPaginator.ts
index a541eb122dd8..ead30c1e2fc5 100644
--- a/clients/client-ssm/src/pagination/ListDocumentsPaginator.ts
+++ b/clients/client-ssm/src/pagination/ListDocumentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDocuments(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/ListOpsItemEventsPaginator.ts b/clients/client-ssm/src/pagination/ListOpsItemEventsPaginator.ts
index 6590395998a1..cd6a9c4a45a4 100644
--- a/clients/client-ssm/src/pagination/ListOpsItemEventsPaginator.ts
+++ b/clients/client-ssm/src/pagination/ListOpsItemEventsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListOpsItemEvents(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/ListOpsItemRelatedItemsPaginator.ts b/clients/client-ssm/src/pagination/ListOpsItemRelatedItemsPaginator.ts
index e41d76152ae4..e37a336e8123 100644
--- a/clients/client-ssm/src/pagination/ListOpsItemRelatedItemsPaginator.ts
+++ b/clients/client-ssm/src/pagination/ListOpsItemRelatedItemsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListOpsItemRelatedItems(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/ListOpsMetadataPaginator.ts b/clients/client-ssm/src/pagination/ListOpsMetadataPaginator.ts
index e5f3765ceca3..568d92a62752 100644
--- a/clients/client-ssm/src/pagination/ListOpsMetadataPaginator.ts
+++ b/clients/client-ssm/src/pagination/ListOpsMetadataPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListOpsMetadata(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/ListResourceComplianceSummariesPaginator.ts b/clients/client-ssm/src/pagination/ListResourceComplianceSummariesPaginator.ts
index d07cb9868afd..e55e673ae3ae 100644
--- a/clients/client-ssm/src/pagination/ListResourceComplianceSummariesPaginator.ts
+++ b/clients/client-ssm/src/pagination/ListResourceComplianceSummariesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListResourceComplianceSummaries(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-ssm/src/pagination/ListResourceDataSyncPaginator.ts b/clients/client-ssm/src/pagination/ListResourceDataSyncPaginator.ts
index 7241608c17fe..b6f5c6424602 100644
--- a/clients/client-ssm/src/pagination/ListResourceDataSyncPaginator.ts
+++ b/clients/client-ssm/src/pagination/ListResourceDataSyncPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListResourceDataSync(
       throw new Error("Invalid client, expected SSM | SSMClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sso-admin/src/pagination/ListAccountAssignmentCreationStatusPaginator.ts b/clients/client-sso-admin/src/pagination/ListAccountAssignmentCreationStatusPaginator.ts
index 2c0968dd3823..24f07de64cae 100644
--- a/clients/client-sso-admin/src/pagination/ListAccountAssignmentCreationStatusPaginator.ts
+++ b/clients/client-sso-admin/src/pagination/ListAccountAssignmentCreationStatusPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAccountAssignmentCreationStatus(
       throw new Error("Invalid client, expected SSOAdmin | SSOAdminClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sso-admin/src/pagination/ListAccountAssignmentDeletionStatusPaginator.ts b/clients/client-sso-admin/src/pagination/ListAccountAssignmentDeletionStatusPaginator.ts
index 1f12189d70bd..a78247eab7c0 100644
--- a/clients/client-sso-admin/src/pagination/ListAccountAssignmentDeletionStatusPaginator.ts
+++ b/clients/client-sso-admin/src/pagination/ListAccountAssignmentDeletionStatusPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAccountAssignmentDeletionStatus(
       throw new Error("Invalid client, expected SSOAdmin | SSOAdminClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sso-admin/src/pagination/ListAccountAssignmentsPaginator.ts b/clients/client-sso-admin/src/pagination/ListAccountAssignmentsPaginator.ts
index 75d53dfe8199..6a3a4455364e 100644
--- a/clients/client-sso-admin/src/pagination/ListAccountAssignmentsPaginator.ts
+++ b/clients/client-sso-admin/src/pagination/ListAccountAssignmentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAccountAssignments(
       throw new Error("Invalid client, expected SSOAdmin | SSOAdminClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sso-admin/src/pagination/ListAccountsForProvisionedPermissionSetPaginator.ts b/clients/client-sso-admin/src/pagination/ListAccountsForProvisionedPermissionSetPaginator.ts
index dbf73db856b0..1cf854e685c1 100644
--- a/clients/client-sso-admin/src/pagination/ListAccountsForProvisionedPermissionSetPaginator.ts
+++ b/clients/client-sso-admin/src/pagination/ListAccountsForProvisionedPermissionSetPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAccountsForProvisionedPermissionSet(
       throw new Error("Invalid client, expected SSOAdmin | SSOAdminClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sso-admin/src/pagination/ListInstancesPaginator.ts b/clients/client-sso-admin/src/pagination/ListInstancesPaginator.ts
index e3013c9d4f65..a8b1d7df5ae6 100644
--- a/clients/client-sso-admin/src/pagination/ListInstancesPaginator.ts
+++ b/clients/client-sso-admin/src/pagination/ListInstancesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListInstances(
       throw new Error("Invalid client, expected SSOAdmin | SSOAdminClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sso-admin/src/pagination/ListManagedPoliciesInPermissionSetPaginator.ts b/clients/client-sso-admin/src/pagination/ListManagedPoliciesInPermissionSetPaginator.ts
index e3aa5d8fed96..631a1b89dd4a 100644
--- a/clients/client-sso-admin/src/pagination/ListManagedPoliciesInPermissionSetPaginator.ts
+++ b/clients/client-sso-admin/src/pagination/ListManagedPoliciesInPermissionSetPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListManagedPoliciesInPermissionSet(
       throw new Error("Invalid client, expected SSOAdmin | SSOAdminClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sso-admin/src/pagination/ListPermissionSetProvisioningStatusPaginator.ts b/clients/client-sso-admin/src/pagination/ListPermissionSetProvisioningStatusPaginator.ts
index 953984722e0d..ed0ef2ce3139 100644
--- a/clients/client-sso-admin/src/pagination/ListPermissionSetProvisioningStatusPaginator.ts
+++ b/clients/client-sso-admin/src/pagination/ListPermissionSetProvisioningStatusPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPermissionSetProvisioningStatus(
       throw new Error("Invalid client, expected SSOAdmin | SSOAdminClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sso-admin/src/pagination/ListPermissionSetsPaginator.ts b/clients/client-sso-admin/src/pagination/ListPermissionSetsPaginator.ts
index 2c292bd892aa..6109fa70f57e 100644
--- a/clients/client-sso-admin/src/pagination/ListPermissionSetsPaginator.ts
+++ b/clients/client-sso-admin/src/pagination/ListPermissionSetsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPermissionSets(
       throw new Error("Invalid client, expected SSOAdmin | SSOAdminClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sso-admin/src/pagination/ListPermissionSetsProvisionedToAccountPaginator.ts b/clients/client-sso-admin/src/pagination/ListPermissionSetsProvisionedToAccountPaginator.ts
index 514c40e11e72..0c1d7aa35d2e 100644
--- a/clients/client-sso-admin/src/pagination/ListPermissionSetsProvisionedToAccountPaginator.ts
+++ b/clients/client-sso-admin/src/pagination/ListPermissionSetsProvisionedToAccountPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPermissionSetsProvisionedToAccount(
       throw new Error("Invalid client, expected SSOAdmin | SSOAdminClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sso-admin/src/pagination/ListTagsForResourcePaginator.ts b/clients/client-sso-admin/src/pagination/ListTagsForResourcePaginator.ts
index a10e474478aa..503ca8745c8c 100644
--- a/clients/client-sso-admin/src/pagination/ListTagsForResourcePaginator.ts
+++ b/clients/client-sso-admin/src/pagination/ListTagsForResourcePaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateListTagsForResource(
       throw new Error("Invalid client, expected SSOAdmin | SSOAdminClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sso/src/pagination/ListAccountRolesPaginator.ts b/clients/client-sso/src/pagination/ListAccountRolesPaginator.ts
index 508383a44c29..627ba0195acb 100644
--- a/clients/client-sso/src/pagination/ListAccountRolesPaginator.ts
+++ b/clients/client-sso/src/pagination/ListAccountRolesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAccountRoles(
       throw new Error("Invalid client, expected SSO | SSOClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-sso/src/pagination/ListAccountsPaginator.ts b/clients/client-sso/src/pagination/ListAccountsPaginator.ts
index 6e8d097130ce..cd978a3af05b 100644
--- a/clients/client-sso/src/pagination/ListAccountsPaginator.ts
+++ b/clients/client-sso/src/pagination/ListAccountsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAccounts(
       throw new Error("Invalid client, expected SSO | SSOClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-storage-gateway/src/pagination/DescribeTapeArchivesPaginator.ts b/clients/client-storage-gateway/src/pagination/DescribeTapeArchivesPaginator.ts
index 4c8536b091bc..17a0f4b84ab5 100644
--- a/clients/client-storage-gateway/src/pagination/DescribeTapeArchivesPaginator.ts
+++ b/clients/client-storage-gateway/src/pagination/DescribeTapeArchivesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeTapeArchives(
       throw new Error("Invalid client, expected StorageGateway | StorageGatewayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-storage-gateway/src/pagination/DescribeTapeRecoveryPointsPaginator.ts b/clients/client-storage-gateway/src/pagination/DescribeTapeRecoveryPointsPaginator.ts
index 4de0b332ad25..46c95957cfec 100644
--- a/clients/client-storage-gateway/src/pagination/DescribeTapeRecoveryPointsPaginator.ts
+++ b/clients/client-storage-gateway/src/pagination/DescribeTapeRecoveryPointsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeTapeRecoveryPoints(
       throw new Error("Invalid client, expected StorageGateway | StorageGatewayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-storage-gateway/src/pagination/DescribeTapesPaginator.ts b/clients/client-storage-gateway/src/pagination/DescribeTapesPaginator.ts
index 1b97e0846ae7..27137a7b762d 100644
--- a/clients/client-storage-gateway/src/pagination/DescribeTapesPaginator.ts
+++ b/clients/client-storage-gateway/src/pagination/DescribeTapesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeTapes(
       throw new Error("Invalid client, expected StorageGateway | StorageGatewayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-storage-gateway/src/pagination/DescribeVTLDevicesPaginator.ts b/clients/client-storage-gateway/src/pagination/DescribeVTLDevicesPaginator.ts
index 00d8b50794bb..cda778a9df99 100644
--- a/clients/client-storage-gateway/src/pagination/DescribeVTLDevicesPaginator.ts
+++ b/clients/client-storage-gateway/src/pagination/DescribeVTLDevicesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeVTLDevices(
       throw new Error("Invalid client, expected StorageGateway | StorageGatewayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-storage-gateway/src/pagination/ListFileSharesPaginator.ts b/clients/client-storage-gateway/src/pagination/ListFileSharesPaginator.ts
index 5752804fd922..d91e33e6759e 100644
--- a/clients/client-storage-gateway/src/pagination/ListFileSharesPaginator.ts
+++ b/clients/client-storage-gateway/src/pagination/ListFileSharesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFileShares(
       throw new Error("Invalid client, expected StorageGateway | StorageGatewayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-storage-gateway/src/pagination/ListFileSystemAssociationsPaginator.ts b/clients/client-storage-gateway/src/pagination/ListFileSystemAssociationsPaginator.ts
index 6d387ee0f33f..8882c31ea76a 100644
--- a/clients/client-storage-gateway/src/pagination/ListFileSystemAssociationsPaginator.ts
+++ b/clients/client-storage-gateway/src/pagination/ListFileSystemAssociationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFileSystemAssociations(
       throw new Error("Invalid client, expected StorageGateway | StorageGatewayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextMarker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-storage-gateway/src/pagination/ListGatewaysPaginator.ts b/clients/client-storage-gateway/src/pagination/ListGatewaysPaginator.ts
index 160050128776..c3e2abe1b2bc 100644
--- a/clients/client-storage-gateway/src/pagination/ListGatewaysPaginator.ts
+++ b/clients/client-storage-gateway/src/pagination/ListGatewaysPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListGateways(
       throw new Error("Invalid client, expected StorageGateway | StorageGatewayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-storage-gateway/src/pagination/ListTagsForResourcePaginator.ts b/clients/client-storage-gateway/src/pagination/ListTagsForResourcePaginator.ts
index c6e3215a5b9f..0d405b266917 100644
--- a/clients/client-storage-gateway/src/pagination/ListTagsForResourcePaginator.ts
+++ b/clients/client-storage-gateway/src/pagination/ListTagsForResourcePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTagsForResource(
       throw new Error("Invalid client, expected StorageGateway | StorageGatewayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-storage-gateway/src/pagination/ListTapePoolsPaginator.ts b/clients/client-storage-gateway/src/pagination/ListTapePoolsPaginator.ts
index 34f043d6d9de..df284cfc5ec1 100644
--- a/clients/client-storage-gateway/src/pagination/ListTapePoolsPaginator.ts
+++ b/clients/client-storage-gateway/src/pagination/ListTapePoolsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTapePools(
       throw new Error("Invalid client, expected StorageGateway | StorageGatewayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-storage-gateway/src/pagination/ListTapesPaginator.ts b/clients/client-storage-gateway/src/pagination/ListTapesPaginator.ts
index 8aaf2b764af8..ca7f089a8b2e 100644
--- a/clients/client-storage-gateway/src/pagination/ListTapesPaginator.ts
+++ b/clients/client-storage-gateway/src/pagination/ListTapesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListTapes(
       throw new Error("Invalid client, expected StorageGateway | StorageGatewayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-storage-gateway/src/pagination/ListVolumesPaginator.ts b/clients/client-storage-gateway/src/pagination/ListVolumesPaginator.ts
index 4b8d029858f4..3bb847cc5f9c 100644
--- a/clients/client-storage-gateway/src/pagination/ListVolumesPaginator.ts
+++ b/clients/client-storage-gateway/src/pagination/ListVolumesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListVolumes(
       throw new Error("Invalid client, expected StorageGateway | StorageGatewayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-support/src/pagination/DescribeCasesPaginator.ts b/clients/client-support/src/pagination/DescribeCasesPaginator.ts
index 7378f810af07..e3c1d9c9dd68 100644
--- a/clients/client-support/src/pagination/DescribeCasesPaginator.ts
+++ b/clients/client-support/src/pagination/DescribeCasesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeCases(
       throw new Error("Invalid client, expected Support | SupportClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-support/src/pagination/DescribeCommunicationsPaginator.ts b/clients/client-support/src/pagination/DescribeCommunicationsPaginator.ts
index 8b5844407a81..b849e0e62551 100644
--- a/clients/client-support/src/pagination/DescribeCommunicationsPaginator.ts
+++ b/clients/client-support/src/pagination/DescribeCommunicationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeCommunications(
       throw new Error("Invalid client, expected Support | SupportClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-swf/src/pagination/GetWorkflowExecutionHistoryPaginator.ts b/clients/client-swf/src/pagination/GetWorkflowExecutionHistoryPaginator.ts
index d16045fc564f..7a72ac3c0f64 100644
--- a/clients/client-swf/src/pagination/GetWorkflowExecutionHistoryPaginator.ts
+++ b/clients/client-swf/src/pagination/GetWorkflowExecutionHistoryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetWorkflowExecutionHistory(
       throw new Error("Invalid client, expected SWF | SWFClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextPageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-swf/src/pagination/ListActivityTypesPaginator.ts b/clients/client-swf/src/pagination/ListActivityTypesPaginator.ts
index 10743a016afe..3f1d9fb1d8c4 100644
--- a/clients/client-swf/src/pagination/ListActivityTypesPaginator.ts
+++ b/clients/client-swf/src/pagination/ListActivityTypesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListActivityTypes(
       throw new Error("Invalid client, expected SWF | SWFClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextPageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-swf/src/pagination/ListClosedWorkflowExecutionsPaginator.ts b/clients/client-swf/src/pagination/ListClosedWorkflowExecutionsPaginator.ts
index f184d902dcd3..9b0099fa3420 100644
--- a/clients/client-swf/src/pagination/ListClosedWorkflowExecutionsPaginator.ts
+++ b/clients/client-swf/src/pagination/ListClosedWorkflowExecutionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListClosedWorkflowExecutions(
       throw new Error("Invalid client, expected SWF | SWFClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextPageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-swf/src/pagination/ListDomainsPaginator.ts b/clients/client-swf/src/pagination/ListDomainsPaginator.ts
index 6b9150e3f23e..79f2aada24b0 100644
--- a/clients/client-swf/src/pagination/ListDomainsPaginator.ts
+++ b/clients/client-swf/src/pagination/ListDomainsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListDomains(
       throw new Error("Invalid client, expected SWF | SWFClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextPageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-swf/src/pagination/ListOpenWorkflowExecutionsPaginator.ts b/clients/client-swf/src/pagination/ListOpenWorkflowExecutionsPaginator.ts
index b389c4017585..b9674b1b5bfc 100644
--- a/clients/client-swf/src/pagination/ListOpenWorkflowExecutionsPaginator.ts
+++ b/clients/client-swf/src/pagination/ListOpenWorkflowExecutionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListOpenWorkflowExecutions(
       throw new Error("Invalid client, expected SWF | SWFClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextPageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-swf/src/pagination/ListWorkflowTypesPaginator.ts b/clients/client-swf/src/pagination/ListWorkflowTypesPaginator.ts
index 77ca3628f916..cbcd2463e259 100644
--- a/clients/client-swf/src/pagination/ListWorkflowTypesPaginator.ts
+++ b/clients/client-swf/src/pagination/ListWorkflowTypesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListWorkflowTypes(
       throw new Error("Invalid client, expected SWF | SWFClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextPageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-swf/src/pagination/PollForDecisionTaskPaginator.ts b/clients/client-swf/src/pagination/PollForDecisionTaskPaginator.ts
index 9dd67649e89f..bf0932a79e1d 100644
--- a/clients/client-swf/src/pagination/PollForDecisionTaskPaginator.ts
+++ b/clients/client-swf/src/pagination/PollForDecisionTaskPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginatePollForDecisionTask(
       throw new Error("Invalid client, expected SWF | SWFClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextPageToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-synthetics/src/pagination/DescribeCanariesLastRunPaginator.ts b/clients/client-synthetics/src/pagination/DescribeCanariesLastRunPaginator.ts
index 81dc47332c61..22c9ebb6681e 100644
--- a/clients/client-synthetics/src/pagination/DescribeCanariesLastRunPaginator.ts
+++ b/clients/client-synthetics/src/pagination/DescribeCanariesLastRunPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeCanariesLastRun(
       throw new Error("Invalid client, expected Synthetics | SyntheticsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-synthetics/src/pagination/DescribeCanariesPaginator.ts b/clients/client-synthetics/src/pagination/DescribeCanariesPaginator.ts
index aef06e085726..387dc438563d 100644
--- a/clients/client-synthetics/src/pagination/DescribeCanariesPaginator.ts
+++ b/clients/client-synthetics/src/pagination/DescribeCanariesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeCanaries(
       throw new Error("Invalid client, expected Synthetics | SyntheticsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-synthetics/src/pagination/DescribeRuntimeVersionsPaginator.ts b/clients/client-synthetics/src/pagination/DescribeRuntimeVersionsPaginator.ts
index 33b9f5bc442e..bda58017482d 100644
--- a/clients/client-synthetics/src/pagination/DescribeRuntimeVersionsPaginator.ts
+++ b/clients/client-synthetics/src/pagination/DescribeRuntimeVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeRuntimeVersions(
       throw new Error("Invalid client, expected Synthetics | SyntheticsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-synthetics/src/pagination/GetCanaryRunsPaginator.ts b/clients/client-synthetics/src/pagination/GetCanaryRunsPaginator.ts
index c84127c3ef4b..416bb4813a59 100644
--- a/clients/client-synthetics/src/pagination/GetCanaryRunsPaginator.ts
+++ b/clients/client-synthetics/src/pagination/GetCanaryRunsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetCanaryRuns(
       throw new Error("Invalid client, expected Synthetics | SyntheticsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-timestream-query/src/pagination/ListScheduledQueriesPaginator.ts b/clients/client-timestream-query/src/pagination/ListScheduledQueriesPaginator.ts
index 77ccf8fc137a..9629e85de1a2 100644
--- a/clients/client-timestream-query/src/pagination/ListScheduledQueriesPaginator.ts
+++ b/clients/client-timestream-query/src/pagination/ListScheduledQueriesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListScheduledQueries(
       throw new Error("Invalid client, expected TimestreamQuery | TimestreamQueryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-timestream-query/src/pagination/ListTagsForResourcePaginator.ts b/clients/client-timestream-query/src/pagination/ListTagsForResourcePaginator.ts
index fa6d53b2ae79..37efccd5768a 100644
--- a/clients/client-timestream-query/src/pagination/ListTagsForResourcePaginator.ts
+++ b/clients/client-timestream-query/src/pagination/ListTagsForResourcePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTagsForResource(
       throw new Error("Invalid client, expected TimestreamQuery | TimestreamQueryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-timestream-query/src/pagination/QueryPaginator.ts b/clients/client-timestream-query/src/pagination/QueryPaginator.ts
index 6627d2a8aabf..7692076db1d8 100644
--- a/clients/client-timestream-query/src/pagination/QueryPaginator.ts
+++ b/clients/client-timestream-query/src/pagination/QueryPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateQuery(
       throw new Error("Invalid client, expected TimestreamQuery | TimestreamQueryClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-timestream-write/src/pagination/ListDatabasesPaginator.ts b/clients/client-timestream-write/src/pagination/ListDatabasesPaginator.ts
index 1294276cf142..d9a5734f9cd4 100644
--- a/clients/client-timestream-write/src/pagination/ListDatabasesPaginator.ts
+++ b/clients/client-timestream-write/src/pagination/ListDatabasesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListDatabases(
       throw new Error("Invalid client, expected TimestreamWrite | TimestreamWriteClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-timestream-write/src/pagination/ListTablesPaginator.ts b/clients/client-timestream-write/src/pagination/ListTablesPaginator.ts
index aa36a994a2be..816d7664c900 100644
--- a/clients/client-timestream-write/src/pagination/ListTablesPaginator.ts
+++ b/clients/client-timestream-write/src/pagination/ListTablesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListTables(
       throw new Error("Invalid client, expected TimestreamWrite | TimestreamWriteClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-transcribe/src/pagination/ListCallAnalyticsCategoriesPaginator.ts b/clients/client-transcribe/src/pagination/ListCallAnalyticsCategoriesPaginator.ts
index c89b38aaaabb..c6286b6827e1 100644
--- a/clients/client-transcribe/src/pagination/ListCallAnalyticsCategoriesPaginator.ts
+++ b/clients/client-transcribe/src/pagination/ListCallAnalyticsCategoriesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCallAnalyticsCategories(
       throw new Error("Invalid client, expected Transcribe | TranscribeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-transcribe/src/pagination/ListCallAnalyticsJobsPaginator.ts b/clients/client-transcribe/src/pagination/ListCallAnalyticsJobsPaginator.ts
index 7a73e619511f..30574a5a4bf8 100644
--- a/clients/client-transcribe/src/pagination/ListCallAnalyticsJobsPaginator.ts
+++ b/clients/client-transcribe/src/pagination/ListCallAnalyticsJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCallAnalyticsJobs(
       throw new Error("Invalid client, expected Transcribe | TranscribeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-transcribe/src/pagination/ListLanguageModelsPaginator.ts b/clients/client-transcribe/src/pagination/ListLanguageModelsPaginator.ts
index b6c001393257..ddcf8d8c2d69 100644
--- a/clients/client-transcribe/src/pagination/ListLanguageModelsPaginator.ts
+++ b/clients/client-transcribe/src/pagination/ListLanguageModelsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListLanguageModels(
       throw new Error("Invalid client, expected Transcribe | TranscribeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-transcribe/src/pagination/ListMedicalTranscriptionJobsPaginator.ts b/clients/client-transcribe/src/pagination/ListMedicalTranscriptionJobsPaginator.ts
index c689f8c82c39..e17ca6b7e407 100644
--- a/clients/client-transcribe/src/pagination/ListMedicalTranscriptionJobsPaginator.ts
+++ b/clients/client-transcribe/src/pagination/ListMedicalTranscriptionJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListMedicalTranscriptionJobs(
       throw new Error("Invalid client, expected Transcribe | TranscribeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-transcribe/src/pagination/ListMedicalVocabulariesPaginator.ts b/clients/client-transcribe/src/pagination/ListMedicalVocabulariesPaginator.ts
index 44195340f37c..7be67eb868f3 100644
--- a/clients/client-transcribe/src/pagination/ListMedicalVocabulariesPaginator.ts
+++ b/clients/client-transcribe/src/pagination/ListMedicalVocabulariesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListMedicalVocabularies(
       throw new Error("Invalid client, expected Transcribe | TranscribeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-transcribe/src/pagination/ListTranscriptionJobsPaginator.ts b/clients/client-transcribe/src/pagination/ListTranscriptionJobsPaginator.ts
index 306ae7584a1e..54ba3d774ddb 100644
--- a/clients/client-transcribe/src/pagination/ListTranscriptionJobsPaginator.ts
+++ b/clients/client-transcribe/src/pagination/ListTranscriptionJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTranscriptionJobs(
       throw new Error("Invalid client, expected Transcribe | TranscribeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-transcribe/src/pagination/ListVocabulariesPaginator.ts b/clients/client-transcribe/src/pagination/ListVocabulariesPaginator.ts
index 904008364ac4..c0d88bdfaee2 100644
--- a/clients/client-transcribe/src/pagination/ListVocabulariesPaginator.ts
+++ b/clients/client-transcribe/src/pagination/ListVocabulariesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListVocabularies(
       throw new Error("Invalid client, expected Transcribe | TranscribeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-transcribe/src/pagination/ListVocabularyFiltersPaginator.ts b/clients/client-transcribe/src/pagination/ListVocabularyFiltersPaginator.ts
index aa03c3adce10..fa0ff4c4813f 100644
--- a/clients/client-transcribe/src/pagination/ListVocabularyFiltersPaginator.ts
+++ b/clients/client-transcribe/src/pagination/ListVocabularyFiltersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListVocabularyFilters(
       throw new Error("Invalid client, expected Transcribe | TranscribeClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-transfer/src/pagination/ListAccessesPaginator.ts b/clients/client-transfer/src/pagination/ListAccessesPaginator.ts
index 072a6a1984c0..ca7cf5929984 100644
--- a/clients/client-transfer/src/pagination/ListAccessesPaginator.ts
+++ b/clients/client-transfer/src/pagination/ListAccessesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAccesses(
       throw new Error("Invalid client, expected Transfer | TransferClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-transfer/src/pagination/ListExecutionsPaginator.ts b/clients/client-transfer/src/pagination/ListExecutionsPaginator.ts
index caa83866f90f..6d142e28cccd 100644
--- a/clients/client-transfer/src/pagination/ListExecutionsPaginator.ts
+++ b/clients/client-transfer/src/pagination/ListExecutionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListExecutions(
       throw new Error("Invalid client, expected Transfer | TransferClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-transfer/src/pagination/ListSecurityPoliciesPaginator.ts b/clients/client-transfer/src/pagination/ListSecurityPoliciesPaginator.ts
index 42d62cff79ea..1767f38eaab9 100644
--- a/clients/client-transfer/src/pagination/ListSecurityPoliciesPaginator.ts
+++ b/clients/client-transfer/src/pagination/ListSecurityPoliciesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSecurityPolicies(
       throw new Error("Invalid client, expected Transfer | TransferClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-transfer/src/pagination/ListServersPaginator.ts b/clients/client-transfer/src/pagination/ListServersPaginator.ts
index d8c73f964b72..91d07f25adf2 100644
--- a/clients/client-transfer/src/pagination/ListServersPaginator.ts
+++ b/clients/client-transfer/src/pagination/ListServersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListServers(
       throw new Error("Invalid client, expected Transfer | TransferClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-transfer/src/pagination/ListTagsForResourcePaginator.ts b/clients/client-transfer/src/pagination/ListTagsForResourcePaginator.ts
index 4f93d0be2a94..16e8e315731c 100644
--- a/clients/client-transfer/src/pagination/ListTagsForResourcePaginator.ts
+++ b/clients/client-transfer/src/pagination/ListTagsForResourcePaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTagsForResource(
       throw new Error("Invalid client, expected Transfer | TransferClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-transfer/src/pagination/ListUsersPaginator.ts b/clients/client-transfer/src/pagination/ListUsersPaginator.ts
index 1b8589589657..8909599c6fe9 100644
--- a/clients/client-transfer/src/pagination/ListUsersPaginator.ts
+++ b/clients/client-transfer/src/pagination/ListUsersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListUsers(
       throw new Error("Invalid client, expected Transfer | TransferClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-transfer/src/pagination/ListWorkflowsPaginator.ts b/clients/client-transfer/src/pagination/ListWorkflowsPaginator.ts
index 1da2b90de2ca..d38a5146f814 100644
--- a/clients/client-transfer/src/pagination/ListWorkflowsPaginator.ts
+++ b/clients/client-transfer/src/pagination/ListWorkflowsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListWorkflows(
       throw new Error("Invalid client, expected Transfer | TransferClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-translate/src/pagination/ListParallelDataPaginator.ts b/clients/client-translate/src/pagination/ListParallelDataPaginator.ts
index 72afc0aea559..444626f66a51 100644
--- a/clients/client-translate/src/pagination/ListParallelDataPaginator.ts
+++ b/clients/client-translate/src/pagination/ListParallelDataPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListParallelData(
       throw new Error("Invalid client, expected Translate | TranslateClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-translate/src/pagination/ListTerminologiesPaginator.ts b/clients/client-translate/src/pagination/ListTerminologiesPaginator.ts
index e5e1554c3bd6..9055dcaf20c2 100644
--- a/clients/client-translate/src/pagination/ListTerminologiesPaginator.ts
+++ b/clients/client-translate/src/pagination/ListTerminologiesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTerminologies(
       throw new Error("Invalid client, expected Translate | TranslateClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-translate/src/pagination/ListTextTranslationJobsPaginator.ts b/clients/client-translate/src/pagination/ListTextTranslationJobsPaginator.ts
index 76a5264b2051..97d88108ae8b 100644
--- a/clients/client-translate/src/pagination/ListTextTranslationJobsPaginator.ts
+++ b/clients/client-translate/src/pagination/ListTextTranslationJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTextTranslationJobs(
       throw new Error("Invalid client, expected Translate | TranslateClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-voice-id/src/pagination/ListDomainsPaginator.ts b/clients/client-voice-id/src/pagination/ListDomainsPaginator.ts
index a63a44975581..a6cf0a72d407 100644
--- a/clients/client-voice-id/src/pagination/ListDomainsPaginator.ts
+++ b/clients/client-voice-id/src/pagination/ListDomainsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListDomains(
       throw new Error("Invalid client, expected VoiceID | VoiceIDClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-voice-id/src/pagination/ListFraudsterRegistrationJobsPaginator.ts b/clients/client-voice-id/src/pagination/ListFraudsterRegistrationJobsPaginator.ts
index b9a81e20cb87..abc848851222 100644
--- a/clients/client-voice-id/src/pagination/ListFraudsterRegistrationJobsPaginator.ts
+++ b/clients/client-voice-id/src/pagination/ListFraudsterRegistrationJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListFraudsterRegistrationJobs(
       throw new Error("Invalid client, expected VoiceID | VoiceIDClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-voice-id/src/pagination/ListSpeakerEnrollmentJobsPaginator.ts b/clients/client-voice-id/src/pagination/ListSpeakerEnrollmentJobsPaginator.ts
index d382a2cc4274..7f07e51e32c7 100644
--- a/clients/client-voice-id/src/pagination/ListSpeakerEnrollmentJobsPaginator.ts
+++ b/clients/client-voice-id/src/pagination/ListSpeakerEnrollmentJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSpeakerEnrollmentJobs(
       throw new Error("Invalid client, expected VoiceID | VoiceIDClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-voice-id/src/pagination/ListSpeakersPaginator.ts b/clients/client-voice-id/src/pagination/ListSpeakersPaginator.ts
index 3e713f13eeed..607d3e5e7b63 100644
--- a/clients/client-voice-id/src/pagination/ListSpeakersPaginator.ts
+++ b/clients/client-voice-id/src/pagination/ListSpeakersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListSpeakers(
       throw new Error("Invalid client, expected VoiceID | VoiceIDClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-wellarchitected/src/pagination/ListAnswersPaginator.ts b/clients/client-wellarchitected/src/pagination/ListAnswersPaginator.ts
index 17e2e0cbab14..91712f0dfe3d 100644
--- a/clients/client-wellarchitected/src/pagination/ListAnswersPaginator.ts
+++ b/clients/client-wellarchitected/src/pagination/ListAnswersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListAnswers(
       throw new Error("Invalid client, expected WellArchitected | WellArchitectedClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-wellarchitected/src/pagination/ListLensReviewImprovementsPaginator.ts b/clients/client-wellarchitected/src/pagination/ListLensReviewImprovementsPaginator.ts
index 46f22fdeb6c1..e41a41dbb9ce 100644
--- a/clients/client-wellarchitected/src/pagination/ListLensReviewImprovementsPaginator.ts
+++ b/clients/client-wellarchitected/src/pagination/ListLensReviewImprovementsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListLensReviewImprovements(
       throw new Error("Invalid client, expected WellArchitected | WellArchitectedClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-wellarchitected/src/pagination/ListLensReviewsPaginator.ts b/clients/client-wellarchitected/src/pagination/ListLensReviewsPaginator.ts
index dbffcc867c01..f8335d51380f 100644
--- a/clients/client-wellarchitected/src/pagination/ListLensReviewsPaginator.ts
+++ b/clients/client-wellarchitected/src/pagination/ListLensReviewsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListLensReviews(
       throw new Error("Invalid client, expected WellArchitected | WellArchitectedClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-wellarchitected/src/pagination/ListLensSharesPaginator.ts b/clients/client-wellarchitected/src/pagination/ListLensSharesPaginator.ts
index 8769873ce9c7..fe08fe2b8e38 100644
--- a/clients/client-wellarchitected/src/pagination/ListLensSharesPaginator.ts
+++ b/clients/client-wellarchitected/src/pagination/ListLensSharesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListLensShares(
       throw new Error("Invalid client, expected WellArchitected | WellArchitectedClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-wellarchitected/src/pagination/ListLensesPaginator.ts b/clients/client-wellarchitected/src/pagination/ListLensesPaginator.ts
index 8f094abca532..a15da185a0c6 100644
--- a/clients/client-wellarchitected/src/pagination/ListLensesPaginator.ts
+++ b/clients/client-wellarchitected/src/pagination/ListLensesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListLenses(
       throw new Error("Invalid client, expected WellArchitected | WellArchitectedClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-wellarchitected/src/pagination/ListMilestonesPaginator.ts b/clients/client-wellarchitected/src/pagination/ListMilestonesPaginator.ts
index d1bfa255415c..f81f3b8b437b 100644
--- a/clients/client-wellarchitected/src/pagination/ListMilestonesPaginator.ts
+++ b/clients/client-wellarchitected/src/pagination/ListMilestonesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListMilestones(
       throw new Error("Invalid client, expected WellArchitected | WellArchitectedClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-wellarchitected/src/pagination/ListNotificationsPaginator.ts b/clients/client-wellarchitected/src/pagination/ListNotificationsPaginator.ts
index f78b3e59af6f..6e75f3845774 100644
--- a/clients/client-wellarchitected/src/pagination/ListNotificationsPaginator.ts
+++ b/clients/client-wellarchitected/src/pagination/ListNotificationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListNotifications(
       throw new Error("Invalid client, expected WellArchitected | WellArchitectedClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-wellarchitected/src/pagination/ListShareInvitationsPaginator.ts b/clients/client-wellarchitected/src/pagination/ListShareInvitationsPaginator.ts
index 131b52549d46..9f93190a660a 100644
--- a/clients/client-wellarchitected/src/pagination/ListShareInvitationsPaginator.ts
+++ b/clients/client-wellarchitected/src/pagination/ListShareInvitationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListShareInvitations(
       throw new Error("Invalid client, expected WellArchitected | WellArchitectedClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-wellarchitected/src/pagination/ListWorkloadSharesPaginator.ts b/clients/client-wellarchitected/src/pagination/ListWorkloadSharesPaginator.ts
index 468ad425cea9..719b014c6eb0 100644
--- a/clients/client-wellarchitected/src/pagination/ListWorkloadSharesPaginator.ts
+++ b/clients/client-wellarchitected/src/pagination/ListWorkloadSharesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListWorkloadShares(
       throw new Error("Invalid client, expected WellArchitected | WellArchitectedClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-wellarchitected/src/pagination/ListWorkloadsPaginator.ts b/clients/client-wellarchitected/src/pagination/ListWorkloadsPaginator.ts
index 5be9be83375f..41e6667b67b9 100644
--- a/clients/client-wellarchitected/src/pagination/ListWorkloadsPaginator.ts
+++ b/clients/client-wellarchitected/src/pagination/ListWorkloadsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListWorkloads(
       throw new Error("Invalid client, expected WellArchitected | WellArchitectedClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-wisdom/src/pagination/ListAssistantAssociationsPaginator.ts b/clients/client-wisdom/src/pagination/ListAssistantAssociationsPaginator.ts
index c87023ccce90..6fb36ea2cf51 100644
--- a/clients/client-wisdom/src/pagination/ListAssistantAssociationsPaginator.ts
+++ b/clients/client-wisdom/src/pagination/ListAssistantAssociationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAssistantAssociations(
       throw new Error("Invalid client, expected Wisdom | WisdomClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-wisdom/src/pagination/ListAssistantsPaginator.ts b/clients/client-wisdom/src/pagination/ListAssistantsPaginator.ts
index efb053f3100d..0d41a9d425aa 100644
--- a/clients/client-wisdom/src/pagination/ListAssistantsPaginator.ts
+++ b/clients/client-wisdom/src/pagination/ListAssistantsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListAssistants(
       throw new Error("Invalid client, expected Wisdom | WisdomClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-wisdom/src/pagination/ListContentsPaginator.ts b/clients/client-wisdom/src/pagination/ListContentsPaginator.ts
index 8abf38b8994f..5e582db32574 100644
--- a/clients/client-wisdom/src/pagination/ListContentsPaginator.ts
+++ b/clients/client-wisdom/src/pagination/ListContentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListContents(
       throw new Error("Invalid client, expected Wisdom | WisdomClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-wisdom/src/pagination/ListKnowledgeBasesPaginator.ts b/clients/client-wisdom/src/pagination/ListKnowledgeBasesPaginator.ts
index af7186531215..e206fa0e5160 100644
--- a/clients/client-wisdom/src/pagination/ListKnowledgeBasesPaginator.ts
+++ b/clients/client-wisdom/src/pagination/ListKnowledgeBasesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListKnowledgeBases(
       throw new Error("Invalid client, expected Wisdom | WisdomClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-wisdom/src/pagination/QueryAssistantPaginator.ts b/clients/client-wisdom/src/pagination/QueryAssistantPaginator.ts
index da3e9a923516..79b654da69b2 100644
--- a/clients/client-wisdom/src/pagination/QueryAssistantPaginator.ts
+++ b/clients/client-wisdom/src/pagination/QueryAssistantPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateQueryAssistant(
       throw new Error("Invalid client, expected Wisdom | WisdomClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-wisdom/src/pagination/SearchContentPaginator.ts b/clients/client-wisdom/src/pagination/SearchContentPaginator.ts
index 9be6d500fef8..eeb5acc2a40d 100644
--- a/clients/client-wisdom/src/pagination/SearchContentPaginator.ts
+++ b/clients/client-wisdom/src/pagination/SearchContentPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchContent(
       throw new Error("Invalid client, expected Wisdom | WisdomClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-wisdom/src/pagination/SearchSessionsPaginator.ts b/clients/client-wisdom/src/pagination/SearchSessionsPaginator.ts
index d1605c3658c9..671b364a8e7b 100644
--- a/clients/client-wisdom/src/pagination/SearchSessionsPaginator.ts
+++ b/clients/client-wisdom/src/pagination/SearchSessionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchSessions(
       throw new Error("Invalid client, expected Wisdom | WisdomClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-workdocs/src/pagination/DescribeDocumentVersionsPaginator.ts b/clients/client-workdocs/src/pagination/DescribeDocumentVersionsPaginator.ts
index 56999e1a367b..31424080dfe9 100644
--- a/clients/client-workdocs/src/pagination/DescribeDocumentVersionsPaginator.ts
+++ b/clients/client-workdocs/src/pagination/DescribeDocumentVersionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeDocumentVersions(
       throw new Error("Invalid client, expected WorkDocs | WorkDocsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-workdocs/src/pagination/DescribeFolderContentsPaginator.ts b/clients/client-workdocs/src/pagination/DescribeFolderContentsPaginator.ts
index 0a7c017c81d1..4780e742c992 100644
--- a/clients/client-workdocs/src/pagination/DescribeFolderContentsPaginator.ts
+++ b/clients/client-workdocs/src/pagination/DescribeFolderContentsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeFolderContents(
       throw new Error("Invalid client, expected WorkDocs | WorkDocsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-workdocs/src/pagination/DescribeUsersPaginator.ts b/clients/client-workdocs/src/pagination/DescribeUsersPaginator.ts
index 6a014219b162..99f2a22ea7ea 100644
--- a/clients/client-workdocs/src/pagination/DescribeUsersPaginator.ts
+++ b/clients/client-workdocs/src/pagination/DescribeUsersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeUsers(
       throw new Error("Invalid client, expected WorkDocs | WorkDocsClient");
     }
     yield page;
+    const prevToken = token;
     token = page.Marker;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-worklink/src/pagination/ListDevicesPaginator.ts b/clients/client-worklink/src/pagination/ListDevicesPaginator.ts
index fc07e137af75..5adb8193b6a9 100644
--- a/clients/client-worklink/src/pagination/ListDevicesPaginator.ts
+++ b/clients/client-worklink/src/pagination/ListDevicesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListDevices(
       throw new Error("Invalid client, expected WorkLink | WorkLinkClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-worklink/src/pagination/ListDomainsPaginator.ts b/clients/client-worklink/src/pagination/ListDomainsPaginator.ts
index 20a1735453aa..1255182e7e0f 100644
--- a/clients/client-worklink/src/pagination/ListDomainsPaginator.ts
+++ b/clients/client-worklink/src/pagination/ListDomainsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListDomains(
       throw new Error("Invalid client, expected WorkLink | WorkLinkClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-worklink/src/pagination/ListFleetsPaginator.ts b/clients/client-worklink/src/pagination/ListFleetsPaginator.ts
index ee49ca4b9d08..c6c73b51c1da 100644
--- a/clients/client-worklink/src/pagination/ListFleetsPaginator.ts
+++ b/clients/client-worklink/src/pagination/ListFleetsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListFleets(
       throw new Error("Invalid client, expected WorkLink | WorkLinkClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-worklink/src/pagination/ListWebsiteAuthorizationProvidersPaginator.ts b/clients/client-worklink/src/pagination/ListWebsiteAuthorizationProvidersPaginator.ts
index 15bc97f09a45..55e344ce825b 100644
--- a/clients/client-worklink/src/pagination/ListWebsiteAuthorizationProvidersPaginator.ts
+++ b/clients/client-worklink/src/pagination/ListWebsiteAuthorizationProvidersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListWebsiteAuthorizationProviders(
       throw new Error("Invalid client, expected WorkLink | WorkLinkClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-worklink/src/pagination/ListWebsiteCertificateAuthoritiesPaginator.ts b/clients/client-worklink/src/pagination/ListWebsiteCertificateAuthoritiesPaginator.ts
index e188d8e60e91..e9a963d11eb6 100644
--- a/clients/client-worklink/src/pagination/ListWebsiteCertificateAuthoritiesPaginator.ts
+++ b/clients/client-worklink/src/pagination/ListWebsiteCertificateAuthoritiesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListWebsiteCertificateAuthorities(
       throw new Error("Invalid client, expected WorkLink | WorkLinkClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-workmail/src/pagination/ListAliasesPaginator.ts b/clients/client-workmail/src/pagination/ListAliasesPaginator.ts
index 229b5d5ba215..3f0abd8182cc 100644
--- a/clients/client-workmail/src/pagination/ListAliasesPaginator.ts
+++ b/clients/client-workmail/src/pagination/ListAliasesPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListAliases(
       throw new Error("Invalid client, expected WorkMail | WorkMailClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-workmail/src/pagination/ListGroupMembersPaginator.ts b/clients/client-workmail/src/pagination/ListGroupMembersPaginator.ts
index cda24704fc6f..82df22774376 100644
--- a/clients/client-workmail/src/pagination/ListGroupMembersPaginator.ts
+++ b/clients/client-workmail/src/pagination/ListGroupMembersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListGroupMembers(
       throw new Error("Invalid client, expected WorkMail | WorkMailClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-workmail/src/pagination/ListGroupsPaginator.ts b/clients/client-workmail/src/pagination/ListGroupsPaginator.ts
index cd1593a7b417..1c05f2233cd3 100644
--- a/clients/client-workmail/src/pagination/ListGroupsPaginator.ts
+++ b/clients/client-workmail/src/pagination/ListGroupsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListGroups(
       throw new Error("Invalid client, expected WorkMail | WorkMailClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-workmail/src/pagination/ListMailDomainsPaginator.ts b/clients/client-workmail/src/pagination/ListMailDomainsPaginator.ts
index ceaabd844779..ecdedbf24fa3 100644
--- a/clients/client-workmail/src/pagination/ListMailDomainsPaginator.ts
+++ b/clients/client-workmail/src/pagination/ListMailDomainsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListMailDomains(
       throw new Error("Invalid client, expected WorkMail | WorkMailClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-workmail/src/pagination/ListMailboxExportJobsPaginator.ts b/clients/client-workmail/src/pagination/ListMailboxExportJobsPaginator.ts
index 67f7a5f8c5b5..46d95904b55b 100644
--- a/clients/client-workmail/src/pagination/ListMailboxExportJobsPaginator.ts
+++ b/clients/client-workmail/src/pagination/ListMailboxExportJobsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListMailboxExportJobs(
       throw new Error("Invalid client, expected WorkMail | WorkMailClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-workmail/src/pagination/ListMailboxPermissionsPaginator.ts b/clients/client-workmail/src/pagination/ListMailboxPermissionsPaginator.ts
index a517d28c0041..3de672b2a16e 100644
--- a/clients/client-workmail/src/pagination/ListMailboxPermissionsPaginator.ts
+++ b/clients/client-workmail/src/pagination/ListMailboxPermissionsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListMailboxPermissions(
       throw new Error("Invalid client, expected WorkMail | WorkMailClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-workmail/src/pagination/ListMobileDeviceAccessOverridesPaginator.ts b/clients/client-workmail/src/pagination/ListMobileDeviceAccessOverridesPaginator.ts
index de8b595c64ca..1faf68056cf9 100644
--- a/clients/client-workmail/src/pagination/ListMobileDeviceAccessOverridesPaginator.ts
+++ b/clients/client-workmail/src/pagination/ListMobileDeviceAccessOverridesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListMobileDeviceAccessOverrides(
       throw new Error("Invalid client, expected WorkMail | WorkMailClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-workmail/src/pagination/ListOrganizationsPaginator.ts b/clients/client-workmail/src/pagination/ListOrganizationsPaginator.ts
index 85185941b76e..f8bef4b71cad 100644
--- a/clients/client-workmail/src/pagination/ListOrganizationsPaginator.ts
+++ b/clients/client-workmail/src/pagination/ListOrganizationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListOrganizations(
       throw new Error("Invalid client, expected WorkMail | WorkMailClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-workmail/src/pagination/ListResourceDelegatesPaginator.ts b/clients/client-workmail/src/pagination/ListResourceDelegatesPaginator.ts
index 15d37f806567..f20bc0fcc7bd 100644
--- a/clients/client-workmail/src/pagination/ListResourceDelegatesPaginator.ts
+++ b/clients/client-workmail/src/pagination/ListResourceDelegatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListResourceDelegates(
       throw new Error("Invalid client, expected WorkMail | WorkMailClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-workmail/src/pagination/ListResourcesPaginator.ts b/clients/client-workmail/src/pagination/ListResourcesPaginator.ts
index 9dd6c33f2dd5..37659b70319b 100644
--- a/clients/client-workmail/src/pagination/ListResourcesPaginator.ts
+++ b/clients/client-workmail/src/pagination/ListResourcesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListResources(
       throw new Error("Invalid client, expected WorkMail | WorkMailClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-workmail/src/pagination/ListUsersPaginator.ts b/clients/client-workmail/src/pagination/ListUsersPaginator.ts
index 725c5012ea81..65d3af56b3d6 100644
--- a/clients/client-workmail/src/pagination/ListUsersPaginator.ts
+++ b/clients/client-workmail/src/pagination/ListUsersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListUsers(
       throw new Error("Invalid client, expected WorkMail | WorkMailClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-workspaces-web/src/pagination/ListBrowserSettingsPaginator.ts b/clients/client-workspaces-web/src/pagination/ListBrowserSettingsPaginator.ts
index b43f6a67071b..e4527b9aee79 100644
--- a/clients/client-workspaces-web/src/pagination/ListBrowserSettingsPaginator.ts
+++ b/clients/client-workspaces-web/src/pagination/ListBrowserSettingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListBrowserSettings(
       throw new Error("Invalid client, expected WorkSpacesWeb | WorkSpacesWebClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-workspaces-web/src/pagination/ListIdentityProvidersPaginator.ts b/clients/client-workspaces-web/src/pagination/ListIdentityProvidersPaginator.ts
index 60ac4b9eb7f2..e88649dd40f4 100644
--- a/clients/client-workspaces-web/src/pagination/ListIdentityProvidersPaginator.ts
+++ b/clients/client-workspaces-web/src/pagination/ListIdentityProvidersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListIdentityProviders(
       throw new Error("Invalid client, expected WorkSpacesWeb | WorkSpacesWebClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-workspaces-web/src/pagination/ListNetworkSettingsPaginator.ts b/clients/client-workspaces-web/src/pagination/ListNetworkSettingsPaginator.ts
index 6697dd0e8b19..2f26cc2c303f 100644
--- a/clients/client-workspaces-web/src/pagination/ListNetworkSettingsPaginator.ts
+++ b/clients/client-workspaces-web/src/pagination/ListNetworkSettingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListNetworkSettings(
       throw new Error("Invalid client, expected WorkSpacesWeb | WorkSpacesWebClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-workspaces-web/src/pagination/ListPortalsPaginator.ts b/clients/client-workspaces-web/src/pagination/ListPortalsPaginator.ts
index 2339d088f304..4b6720cb6be7 100644
--- a/clients/client-workspaces-web/src/pagination/ListPortalsPaginator.ts
+++ b/clients/client-workspaces-web/src/pagination/ListPortalsPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateListPortals(
       throw new Error("Invalid client, expected WorkSpacesWeb | WorkSpacesWebClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-workspaces-web/src/pagination/ListTrustStoreCertificatesPaginator.ts b/clients/client-workspaces-web/src/pagination/ListTrustStoreCertificatesPaginator.ts
index 1b13b364711c..aaebcdcf4302 100644
--- a/clients/client-workspaces-web/src/pagination/ListTrustStoreCertificatesPaginator.ts
+++ b/clients/client-workspaces-web/src/pagination/ListTrustStoreCertificatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTrustStoreCertificates(
       throw new Error("Invalid client, expected WorkSpacesWeb | WorkSpacesWebClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-workspaces-web/src/pagination/ListTrustStoresPaginator.ts b/clients/client-workspaces-web/src/pagination/ListTrustStoresPaginator.ts
index 73a8e27f008a..d4183a106223 100644
--- a/clients/client-workspaces-web/src/pagination/ListTrustStoresPaginator.ts
+++ b/clients/client-workspaces-web/src/pagination/ListTrustStoresPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListTrustStores(
       throw new Error("Invalid client, expected WorkSpacesWeb | WorkSpacesWebClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-workspaces-web/src/pagination/ListUserSettingsPaginator.ts b/clients/client-workspaces-web/src/pagination/ListUserSettingsPaginator.ts
index e3c4c6f6d807..9f017efe0742 100644
--- a/clients/client-workspaces-web/src/pagination/ListUserSettingsPaginator.ts
+++ b/clients/client-workspaces-web/src/pagination/ListUserSettingsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListUserSettings(
       throw new Error("Invalid client, expected WorkSpacesWeb | WorkSpacesWebClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-workspaces/src/pagination/DescribeWorkspaceBundlesPaginator.ts b/clients/client-workspaces/src/pagination/DescribeWorkspaceBundlesPaginator.ts
index 6c50bbd8b546..1b22731f0175 100644
--- a/clients/client-workspaces/src/pagination/DescribeWorkspaceBundlesPaginator.ts
+++ b/clients/client-workspaces/src/pagination/DescribeWorkspaceBundlesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateDescribeWorkspaceBundles(
       throw new Error("Invalid client, expected WorkSpaces | WorkSpacesClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-workspaces/src/pagination/DescribeWorkspaceDirectoriesPaginator.ts b/clients/client-workspaces/src/pagination/DescribeWorkspaceDirectoriesPaginator.ts
index 39710d131ed9..2bb1cd69b802 100644
--- a/clients/client-workspaces/src/pagination/DescribeWorkspaceDirectoriesPaginator.ts
+++ b/clients/client-workspaces/src/pagination/DescribeWorkspaceDirectoriesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateDescribeWorkspaceDirectories(
       throw new Error("Invalid client, expected WorkSpaces | WorkSpacesClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-workspaces/src/pagination/DescribeWorkspacesPaginator.ts b/clients/client-workspaces/src/pagination/DescribeWorkspacesPaginator.ts
index 025e1c694946..4465876cb145 100644
--- a/clients/client-workspaces/src/pagination/DescribeWorkspacesPaginator.ts
+++ b/clients/client-workspaces/src/pagination/DescribeWorkspacesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateDescribeWorkspaces(
       throw new Error("Invalid client, expected WorkSpaces | WorkSpacesClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-xray/src/pagination/BatchGetTracesPaginator.ts b/clients/client-xray/src/pagination/BatchGetTracesPaginator.ts
index 8d8e693ea053..fff3d6410898 100644
--- a/clients/client-xray/src/pagination/BatchGetTracesPaginator.ts
+++ b/clients/client-xray/src/pagination/BatchGetTracesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateBatchGetTraces(
       throw new Error("Invalid client, expected XRay | XRayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-xray/src/pagination/GetGroupsPaginator.ts b/clients/client-xray/src/pagination/GetGroupsPaginator.ts
index 8ac432bfde01..e00a651e0b33 100644
--- a/clients/client-xray/src/pagination/GetGroupsPaginator.ts
+++ b/clients/client-xray/src/pagination/GetGroupsPaginator.ts
@@ -46,8 +46,9 @@ export async function* paginateGetGroups(
       throw new Error("Invalid client, expected XRay | XRayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-xray/src/pagination/GetInsightEventsPaginator.ts b/clients/client-xray/src/pagination/GetInsightEventsPaginator.ts
index 49c9d63c99d8..af909f150f78 100644
--- a/clients/client-xray/src/pagination/GetInsightEventsPaginator.ts
+++ b/clients/client-xray/src/pagination/GetInsightEventsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetInsightEvents(
       throw new Error("Invalid client, expected XRay | XRayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-xray/src/pagination/GetInsightSummariesPaginator.ts b/clients/client-xray/src/pagination/GetInsightSummariesPaginator.ts
index d78a447e132d..f7d6566e11fb 100644
--- a/clients/client-xray/src/pagination/GetInsightSummariesPaginator.ts
+++ b/clients/client-xray/src/pagination/GetInsightSummariesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateGetInsightSummaries(
       throw new Error("Invalid client, expected XRay | XRayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-xray/src/pagination/GetSamplingRulesPaginator.ts b/clients/client-xray/src/pagination/GetSamplingRulesPaginator.ts
index 3343ace50ed1..8627f8ae336a 100644
--- a/clients/client-xray/src/pagination/GetSamplingRulesPaginator.ts
+++ b/clients/client-xray/src/pagination/GetSamplingRulesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateGetSamplingRules(
       throw new Error("Invalid client, expected XRay | XRayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-xray/src/pagination/GetSamplingStatisticSummariesPaginator.ts b/clients/client-xray/src/pagination/GetSamplingStatisticSummariesPaginator.ts
index 2202422d8cdf..83ce2b2f6296 100644
--- a/clients/client-xray/src/pagination/GetSamplingStatisticSummariesPaginator.ts
+++ b/clients/client-xray/src/pagination/GetSamplingStatisticSummariesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateGetSamplingStatisticSummaries(
       throw new Error("Invalid client, expected XRay | XRayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-xray/src/pagination/GetServiceGraphPaginator.ts b/clients/client-xray/src/pagination/GetServiceGraphPaginator.ts
index 2aae50a5cfe1..291633b27d1a 100644
--- a/clients/client-xray/src/pagination/GetServiceGraphPaginator.ts
+++ b/clients/client-xray/src/pagination/GetServiceGraphPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateGetServiceGraph(
       throw new Error("Invalid client, expected XRay | XRayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-xray/src/pagination/GetTimeSeriesServiceStatisticsPaginator.ts b/clients/client-xray/src/pagination/GetTimeSeriesServiceStatisticsPaginator.ts
index dc958628086a..884f8f57d690 100644
--- a/clients/client-xray/src/pagination/GetTimeSeriesServiceStatisticsPaginator.ts
+++ b/clients/client-xray/src/pagination/GetTimeSeriesServiceStatisticsPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateGetTimeSeriesServiceStatistics(
       throw new Error("Invalid client, expected XRay | XRayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-xray/src/pagination/GetTraceGraphPaginator.ts b/clients/client-xray/src/pagination/GetTraceGraphPaginator.ts
index 8bfea4010614..c50c37ef1855 100644
--- a/clients/client-xray/src/pagination/GetTraceGraphPaginator.ts
+++ b/clients/client-xray/src/pagination/GetTraceGraphPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateGetTraceGraph(
       throw new Error("Invalid client, expected XRay | XRayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-xray/src/pagination/GetTraceSummariesPaginator.ts b/clients/client-xray/src/pagination/GetTraceSummariesPaginator.ts
index ef2b001fe56f..606248b89bd8 100644
--- a/clients/client-xray/src/pagination/GetTraceSummariesPaginator.ts
+++ b/clients/client-xray/src/pagination/GetTraceSummariesPaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateGetTraceSummaries(
       throw new Error("Invalid client, expected XRay | XRayClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/packages/types/src/pagination.ts b/packages/types/src/pagination.ts
index 3bbf42c91e48..5bb210556829 100644
--- a/packages/types/src/pagination.ts
+++ b/packages/types/src/pagination.ts
@@ -13,4 +13,12 @@ export interface PaginationConfiguration {
   client: Client<any, any, any>;
   pageSize?: number;
   startingToken?: any;
+  /**
+   * For some APIs, such as CloudWatchLogs events, the next page token will always
+   * be present.
+   *
+   * When true, this config field will have the paginator stop when the token doesn't change
+   * instead of when it is not present.
+   */
+  stopOnSameToken?: boolean;
 }

From 4c2a438b659a34bf3e554b29a4fcd5df391f8b3d Mon Sep 17 00:00:00 2001
From: George Fu <georgfu@amazon.com>
Date: Mon, 25 Apr 2022 20:24:40 +0000
Subject: [PATCH 2/2] feat(types): pagination, update client codegen

---
 .../src/pagination/ListObservabilityConfigurationsPaginator.ts | 3 ++-
 .../src/pagination/ListPhoneNumbersV2Paginator.ts              | 3 ++-
 .../src/pagination/SearchAvailablePhoneNumbersPaginator.ts     | 3 ++-
 clients/client-connect/src/pagination/SearchUsersPaginator.ts  | 3 ++-
 .../src/pagination/ListCustomEntityTypesPaginator.ts           | 3 ++-
 .../src/pagination/BatchGetAssetPropertyAggregatesPaginator.ts | 3 ++-
 .../pagination/BatchGetAssetPropertyValueHistoryPaginator.ts   | 3 ++-
 .../src/pagination/BatchGetAssetPropertyValuePaginator.ts      | 3 ++-
 .../src/pagination/ListLiveSourcesPaginator.ts                 | 3 ++-
 9 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/clients/client-apprunner/src/pagination/ListObservabilityConfigurationsPaginator.ts b/clients/client-apprunner/src/pagination/ListObservabilityConfigurationsPaginator.ts
index a2a4898306b9..bbe519d03175 100644
--- a/clients/client-apprunner/src/pagination/ListObservabilityConfigurationsPaginator.ts
+++ b/clients/client-apprunner/src/pagination/ListObservabilityConfigurationsPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListObservabilityConfigurations(
       throw new Error("Invalid client, expected AppRunner | AppRunnerClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/ListPhoneNumbersV2Paginator.ts b/clients/client-connect/src/pagination/ListPhoneNumbersV2Paginator.ts
index 5a8b4cee814c..6649e3a1dc3e 100644
--- a/clients/client-connect/src/pagination/ListPhoneNumbersV2Paginator.ts
+++ b/clients/client-connect/src/pagination/ListPhoneNumbersV2Paginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListPhoneNumbersV2(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/SearchAvailablePhoneNumbersPaginator.ts b/clients/client-connect/src/pagination/SearchAvailablePhoneNumbersPaginator.ts
index 4bb87fb11cff..504955f28bfb 100644
--- a/clients/client-connect/src/pagination/SearchAvailablePhoneNumbersPaginator.ts
+++ b/clients/client-connect/src/pagination/SearchAvailablePhoneNumbersPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateSearchAvailablePhoneNumbers(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-connect/src/pagination/SearchUsersPaginator.ts b/clients/client-connect/src/pagination/SearchUsersPaginator.ts
index 7ab80f0d710d..205e5475517f 100644
--- a/clients/client-connect/src/pagination/SearchUsersPaginator.ts
+++ b/clients/client-connect/src/pagination/SearchUsersPaginator.ts
@@ -47,8 +47,9 @@ export async function* paginateSearchUsers(
       throw new Error("Invalid client, expected Connect | ConnectClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-glue/src/pagination/ListCustomEntityTypesPaginator.ts b/clients/client-glue/src/pagination/ListCustomEntityTypesPaginator.ts
index 65fd3d0fc259..528e01d31b17 100644
--- a/clients/client-glue/src/pagination/ListCustomEntityTypesPaginator.ts
+++ b/clients/client-glue/src/pagination/ListCustomEntityTypesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListCustomEntityTypes(
       throw new Error("Invalid client, expected Glue | GlueClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotsitewise/src/pagination/BatchGetAssetPropertyAggregatesPaginator.ts b/clients/client-iotsitewise/src/pagination/BatchGetAssetPropertyAggregatesPaginator.ts
index c3d679458790..94bb82c04cc3 100644
--- a/clients/client-iotsitewise/src/pagination/BatchGetAssetPropertyAggregatesPaginator.ts
+++ b/clients/client-iotsitewise/src/pagination/BatchGetAssetPropertyAggregatesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateBatchGetAssetPropertyAggregates(
       throw new Error("Invalid client, expected IoTSiteWise | IoTSiteWiseClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotsitewise/src/pagination/BatchGetAssetPropertyValueHistoryPaginator.ts b/clients/client-iotsitewise/src/pagination/BatchGetAssetPropertyValueHistoryPaginator.ts
index 7e1e05ba5662..4f300bf1d213 100644
--- a/clients/client-iotsitewise/src/pagination/BatchGetAssetPropertyValueHistoryPaginator.ts
+++ b/clients/client-iotsitewise/src/pagination/BatchGetAssetPropertyValueHistoryPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateBatchGetAssetPropertyValueHistory(
       throw new Error("Invalid client, expected IoTSiteWise | IoTSiteWiseClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-iotsitewise/src/pagination/BatchGetAssetPropertyValuePaginator.ts b/clients/client-iotsitewise/src/pagination/BatchGetAssetPropertyValuePaginator.ts
index 89e7b2bc7f90..69cdc9a6cd1e 100644
--- a/clients/client-iotsitewise/src/pagination/BatchGetAssetPropertyValuePaginator.ts
+++ b/clients/client-iotsitewise/src/pagination/BatchGetAssetPropertyValuePaginator.ts
@@ -50,8 +50,9 @@ export async function* paginateBatchGetAssetPropertyValue(
       throw new Error("Invalid client, expected IoTSiteWise | IoTSiteWiseClient");
     }
     yield page;
+    const prevToken = token;
     token = page.nextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;
diff --git a/clients/client-mediatailor/src/pagination/ListLiveSourcesPaginator.ts b/clients/client-mediatailor/src/pagination/ListLiveSourcesPaginator.ts
index 7fa1fe5b1f10..0776f2809fef 100644
--- a/clients/client-mediatailor/src/pagination/ListLiveSourcesPaginator.ts
+++ b/clients/client-mediatailor/src/pagination/ListLiveSourcesPaginator.ts
@@ -51,8 +51,9 @@ export async function* paginateListLiveSources(
       throw new Error("Invalid client, expected MediaTailor | MediaTailorClient");
     }
     yield page;
+    const prevToken = token;
     token = page.NextToken;
-    hasNext = !!token;
+    hasNext = !!(token && (!config.stopOnSameToken || token !== prevToken));
   }
   // @ts-ignore
   return undefined;