@@ -14,6 +14,8 @@ breaking:
   ignore:
     - google
     - temporal/api/enums/v1/failed_cause.proto
+    # TODO: remove this once the changes with WorkflowExecutionExtendedInfo.pause_info is merged
+    - temporal/api/workflow/v1/message.proto
 lint:
   use:
     - DEFAULT
 
@@ -1490,7 +1490,7 @@
           },
           {
             "name": "taskQueue.kind",
-            "description": "Default: TASK_QUEUE_KIND_NORMAL.\n\n - TASK_QUEUE_KIND_NORMAL: Tasks from a normal workflow task queue always include complete workflow history\n\nThe task queue specified by the user is always a normal task queue. There can be as many\nworkers as desired for a single normal task queue. All those workers may pick up tasks from\nthat queue.\n - TASK_QUEUE_KIND_STICKY: A sticky queue only includes new history since the last workflow task, and they are\nper-worker.\n\nSticky queues are created dynamically by each worker during their start up. They only exist\nfor the lifetime of the worker process. Tasks in a sticky task queue are only available to\nthe worker that created the sticky queue.\n\nSticky queues are only for workflow tasks. There are no sticky task queues for activities.",
+            "description": "Default: TASK_QUEUE_KIND_NORMAL.\n\n - TASK_QUEUE_KIND_UNSPECIFIED: Tasks from any non workflow task may be unspecified.\n\nTask queue kind is used to differentiate whether a workflow task queue is sticky or \nnormal. If a task is not a workflow task, Task queue kind will sometimes be \nunspecified.\n - TASK_QUEUE_KIND_NORMAL: Tasks from a normal workflow task queue always include complete workflow history\n\nThe task queue specified by the user is always a normal task queue. There can be as many\nworkers as desired for a single normal task queue. All those workers may pick up tasks from\nthat queue.\n - TASK_QUEUE_KIND_STICKY: A sticky queue only includes new history since the last workflow task, and they are\nper-worker.\n\nSticky queues are created dynamically by each worker during their start up. They only exist\nfor the lifetime of the worker process. Tasks in a sticky task queue are only available to\nthe worker that created the sticky queue.\n\nSticky queues are only for workflow tasks. There are no sticky task queues for activities.",
             "in": "query",
             "required": false,
             "type": "string",
@@ -5354,7 +5354,7 @@
           },
           {
             "name": "taskQueue.kind",
-            "description": "Default: TASK_QUEUE_KIND_NORMAL.\n\n - TASK_QUEUE_KIND_NORMAL: Tasks from a normal workflow task queue always include complete workflow history\n\nThe task queue specified by the user is always a normal task queue. There can be as many\nworkers as desired for a single normal task queue. All those workers may pick up tasks from\nthat queue.\n - TASK_QUEUE_KIND_STICKY: A sticky queue only includes new history since the last workflow task, and they are\nper-worker.\n\nSticky queues are created dynamically by each worker during their start up. They only exist\nfor the lifetime of the worker process. Tasks in a sticky task queue are only available to\nthe worker that created the sticky queue.\n\nSticky queues are only for workflow tasks. There are no sticky task queues for activities.",
+            "description": "Default: TASK_QUEUE_KIND_NORMAL.\n\n - TASK_QUEUE_KIND_UNSPECIFIED: Tasks from any non workflow task may be unspecified.\n\nTask queue kind is used to differentiate whether a workflow task queue is sticky or \nnormal. If a task is not a workflow task, Task queue kind will sometimes be \nunspecified.\n - TASK_QUEUE_KIND_NORMAL: Tasks from a normal workflow task queue always include complete workflow history\n\nThe task queue specified by the user is always a normal task queue. There can be as many\nworkers as desired for a single normal task queue. All those workers may pick up tasks from\nthat queue.\n - TASK_QUEUE_KIND_STICKY: A sticky queue only includes new history since the last workflow task, and they are\nper-worker.\n\nSticky queues are created dynamically by each worker during their start up. They only exist\nfor the lifetime of the worker process. Tasks in a sticky task queue are only available to\nthe worker that created the sticky queue.\n\nSticky queues are only for workflow tasks. There are no sticky task queues for activities.",
             "in": "query",
             "required": false,
             "type": "string",
@@ -15523,8 +15523,7 @@
         "TASK_QUEUE_KIND_STICKY"
       ],
       "default": "TASK_QUEUE_KIND_UNSPECIFIED",
-      "description": "The task queue specified by the user is always a normal task queue. There can be as many\nworkers as desired for a single normal task queue. All those workers may pick up tasks from\nthat queue.\n - TASK_QUEUE_KIND_STICKY: A sticky queue only includes new history since the last workflow task, and they are\nper-worker.\n\nSticky queues are created dynamically by each worker during their start up. They only exist\nfor the lifetime of the worker process. Tasks in a sticky task queue are only available to\nthe worker that created the sticky queue.\n\nSticky queues are only for workflow tasks. There are no sticky task queues for activities.",
-      "title": "- TASK_QUEUE_KIND_NORMAL: Tasks from a normal workflow task queue always include complete workflow history"
+      "description": " - TASK_QUEUE_KIND_UNSPECIFIED: Tasks from any non workflow task may be unspecified.\n\nTask queue kind is used to differentiate whether a workflow task queue is sticky or \nnormal. If a task is not a workflow task, Task queue kind will sometimes be \nunspecified.\n - TASK_QUEUE_KIND_NORMAL: Tasks from a normal workflow task queue always include complete workflow history\n\nThe task queue specified by the user is always a normal task queue. There can be as many\nworkers as desired for a single normal task queue. All those workers may pick up tasks from\nthat queue.\n - TASK_QUEUE_KIND_STICKY: A sticky queue only includes new history since the last workflow task, and they are\nper-worker.\n\nSticky queues are created dynamically by each worker during their start up. They only exist\nfor the lifetime of the worker process. Tasks in a sticky task queue are only available to\nthe worker that created the sticky queue.\n\nSticky queues are only for workflow tasks. There are no sticky task queues for activities."
     },
     "v1TaskQueueMetadata": {
       "type": "object",
@@ -16841,6 +16840,10 @@
             "$ref": "#/definitions/v1RequestIdInfo"
           },
           "description": "Request ID information (eg: history event information associated with the request ID).\nNote: It only contains request IDs from StartWorkflowExecution requests, including indirect\ncalls (eg: if SignalWithStartWorkflowExecution starts a new workflow, then the request ID is\nused in the StartWorkflowExecution request)."
+        },
+        "pauseInfo": {
+          "$ref": "#/definitions/v1WorkflowExecutionPauseInfo",
+          "description": "Information about the workflow execution pause operation."
         }
       },
       "description": "Holds all the extra information about workflow execution that is not part of Visibility."
@@ -16966,10 +16969,6 @@
         "priority": {
           "$ref": "#/definitions/v1Priority",
           "title": "Priority metadata"
-        },
-        "pauseInfo": {
-          "$ref": "#/definitions/v1WorkflowExecutionPauseInfo",
-          "description": "Information about the workflow execution pause operation."
         }
       },
       "description": "Hold basic information about a workflow execution.\nThis structure is a part of visibility, and thus contain a limited subset of information."
@@ -17408,7 +17407,7 @@
         "revisionNumber": {
           "type": "string",
           "format": "int64",
-          "description": "Monotonic counter reflecting the latest routing decision for this workflow execution.\nUsed for staleness detection between history and matching when dispatching tasks to workers.\nIncremented when a workflow execution routes to a new deployment version, which happens \nwhen a worker of the new deployment version completes a workflow task.\nNote: Pinned tasks and sticky tasks send a value of 0 for this field since these tasks do not\nface the problem of inconsistent dispatching that arises from eventual consistency between \ntask queues and their partitions."
+          "description": "Monotonic counter reflecting the latest routing decision for this workflow execution.\nUsed for staleness detection between history and matching when dispatching tasks to workers.\nIncremented when a workflow execution routes to a new deployment version, which happens\nwhen a worker of the new deployment version completes a workflow task.\nNote: Pinned tasks and sticky tasks send a value of 0 for this field since these tasks do not\nface the problem of inconsistent dispatching that arises from eventual consistency between\ntask queues and their partitions."
         }
       },
       "description": "Holds all the information about worker versioning for a particular workflow execution.\nExperimental. Versioning info is experimental and might change in the future."
 
@@ -14272,6 +14272,10 @@ components:
              Note: It only contains request IDs from StartWorkflowExecution requests, including indirect
              calls (eg: if SignalWithStartWorkflowExecution starts a new workflow, then the request ID is
              used in the StartWorkflowExecution request).
+        pauseInfo:
+          allOf:
+            - $ref: '#/components/schemas/WorkflowExecutionPauseInfo'
+          description: Information about the workflow execution pause operation.
       description: Holds all the extra information about workflow execution that is not part of Visibility.
     WorkflowExecutionFailedEventAttributes:
       type: object
@@ -14419,10 +14423,6 @@ components:
           allOf:
             - $ref: '#/components/schemas/Priority'
           description: Priority metadata
-        pauseInfo:
-          allOf:
-            - $ref: '#/components/schemas/WorkflowExecutionPauseInfo'
-          description: Information about the workflow execution pause operation.
       description: |-
         Hold basic information about a workflow execution.
          This structure is a part of visibility, and thus contain a limited subset of information.
@@ -14928,7 +14928,14 @@ components:
              completed, pending activities will start their next attempt on the new version.
         revisionNumber:
           type: string
-          description: "Monotonic counter reflecting the latest routing decision for this workflow execution.\n Used for staleness detection between history and matching when dispatching tasks to workers.\n Incremented when a workflow execution routes to a new deployment version, which happens \n when a worker of the new deployment version completes a workflow task.\n Note: Pinned tasks and sticky tasks send a value of 0 for this field since these tasks do not\n face the problem of inconsistent dispatching that arises from eventual consistency between \n task queues and their partitions."
+          description: |-
+            Monotonic counter reflecting the latest routing decision for this workflow execution.
+             Used for staleness detection between history and matching when dispatching tasks to workers.
+             Incremented when a workflow execution routes to a new deployment version, which happens
+             when a worker of the new deployment version completes a workflow task.
+             Note: Pinned tasks and sticky tasks send a value of 0 for this field since these tasks do not
+             face the problem of inconsistent dispatching that arises from eventual consistency between
+             task queues and their partitions.
       description: |-
         Holds all the information about worker versioning for a particular workflow execution.
          Experimental. Versioning info is experimental and might change in the future.
 
@@ -10,6 +10,11 @@ option ruby_package = "Temporalio::Api::Enums::V1";
 option csharp_namespace = "Temporalio.Api.Enums.V1";
 
 enum TaskQueueKind {
+    // Tasks from any non workflow task may be unspecified.
+    //
+    // Task queue kind is used to differentiate whether a workflow task queue is sticky or 
+    // normal. If a task is not a workflow task, Task queue kind will sometimes be 
+    // unspecified.
     TASK_QUEUE_KIND_UNSPECIFIED = 0;
     // Tasks from a normal workflow task queue always include complete workflow history
     //
 
@@ -98,9 +98,6 @@ message WorkflowExecutionInfo {
 
     // Priority metadata
     temporal.api.common.v1.Priority priority = 24;
-
-    // Information about the workflow execution pause operation.
-    WorkflowExecutionPauseInfo pause_info = 25;
 }
 
 // Holds all the extra information about workflow execution that is not part of Visibility.
@@ -129,6 +126,9 @@ message WorkflowExecutionExtendedInfo {
     // calls (eg: if SignalWithStartWorkflowExecution starts a new workflow, then the request ID is
     // used in the StartWorkflowExecution request).
     map<string, RequestIdInfo> request_id_infos = 7;
+
+    // Information about the workflow execution pause operation.
+    WorkflowExecutionPauseInfo pause_info = 8;
 }
 
 // Holds all the information about worker versioning for a particular workflow execution.
@@ -219,10 +219,10 @@ message WorkflowExecutionVersioningInfo {
     DeploymentVersionTransition version_transition = 6;
     // Monotonic counter reflecting the latest routing decision for this workflow execution.
     // Used for staleness detection between history and matching when dispatching tasks to workers.
-    // Incremented when a workflow execution routes to a new deployment version, which happens 
+    // Incremented when a workflow execution routes to a new deployment version, which happens
     // when a worker of the new deployment version completes a workflow task.
     // Note: Pinned tasks and sticky tasks send a value of 0 for this field since these tasks do not
-    // face the problem of inconsistent dispatching that arises from eventual consistency between 
+    // face the problem of inconsistent dispatching that arises from eventual consistency between
     // task queues and their partitions.
     int64 revision_number = 8;
 }