diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 34b2b23072f14d..65df21860e0807 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.36.3-alpha
+current_version = 0.36.5-alpha
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-[a-z]+)?
diff --git a/.env b/.env
index 056bc9558a3898..12df5d2e93b97a 100644
--- a/.env
+++ b/.env
@@ -10,7 +10,7 @@
 
 
 ### SHARED ###
-VERSION=0.36.3-alpha
+VERSION=0.36.5-alpha
 
 # When using the airbyte-db via default docker image
 CONFIG_ROOT=/data
@@ -40,7 +40,7 @@ DATABASE_PASSWORD=docker
 DATABASE_HOST=db
 DATABASE_PORT=5432
 DATABASE_DB=airbyte
-# translate manually DATABASE_URL=jdbc:postgresql://${DATABASE_HOST}:${DATABASE_PORT/${DATABASE_DB} (do not include the username or password here)
+# translate manually DATABASE_URL=jdbc:postgresql://${DATABASE_HOST}:${DATABASE_PORT}/${DATABASE_DB} (do not include the username or password here)
 DATABASE_URL=jdbc:postgresql://db:5432/airbyte
 JOBS_DATABASE_MINIMUM_FLYWAY_MIGRATION_VERSION=0.29.15.001
 
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
deleted file mode 100644
index 793172b2911a40..00000000000000
--- a/.github/workflows/documentation.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: compile-docusaurus-static-assets
-
-on:
-  push:
-    branches: [master]
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  deploy-docusaurus-to-docs-airbyte-io:
-    runs-on: ubuntu-latest
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - name: Check out repo
-        # `uses` taps GH ORG/REPO@version.
-        # "actions" is a default org for some common GH actions
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      # Node is required for yarn
-      - name: Set up Yarn
-        uses: actions/setup-node@v2
-        with:
-          node-version: '16.13.0'
-          cache: 'yarn'
-          cache-dependency-path: docusaurus
-      # # Build Docusaurus website
-      # - name: Check for docusaurus changes not committed
-      #   run: ./tools/bin/check_docusaurus_build_changes
-      # # Install and build Docusaurus website
-      # - name: Deploy docs to production (it's weird)
-      #   run: ./tools/bin/deploy_docusaurus
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.OCTAVIA_PAT }}
-
diff --git a/.github/workflows/publish-command.yml b/.github/workflows/publish-command.yml
index b7c0aaa175198a..e1590d173a2540 100644
--- a/.github/workflows/publish-command.yml
+++ b/.github/workflows/publish-command.yml
@@ -228,6 +228,7 @@ jobs:
         run: |
           git add -u
           git commit -m "auto-bump connector version"
+          git pull origin ${{ github.event.inputs.gitref }}
           git push origin ${{ github.event.inputs.gitref }}
       - name: Add Version Bump Success Comment
         if: github.event.inputs.comment-id && github.event.inputs.auto-bump-version == 'true' && success()
diff --git a/.github/workflows/slash-commands.yml b/.github/workflows/slash-commands.yml
index 6f01c940e447eb..1c2aed0b941e13 100644
--- a/.github/workflows/slash-commands.yml
+++ b/.github/workflows/slash-commands.yml
@@ -22,6 +22,8 @@ jobs:
           commands: |
             test
             test-performance
+            build-connector
+            publish-connector
             publish
             publish-external
             publish-cdk
diff --git a/airbyte-api/src/main/openapi/config.yaml b/airbyte-api/src/main/openapi/config.yaml
index 477d7ee688daad..c1fdc0044d4bc6 100644
--- a/airbyte-api/src/main/openapi/config.yaml
+++ b/airbyte-api/src/main/openapi/config.yaml
@@ -3143,7 +3143,6 @@ components:
     WebBackendConnectionCreate:
       type: object
       required:
-        - connection
         - sourceId
         - destinationId
         - status
diff --git a/airbyte-bootloader/Dockerfile b/airbyte-bootloader/Dockerfile
index e2753b0957d2ab..ddca518b1f5fa0 100644
--- a/airbyte-bootloader/Dockerfile
+++ b/airbyte-bootloader/Dockerfile
@@ -1,7 +1,7 @@
 ARG JDK_VERSION=17.0.1
 FROM openjdk:${JDK_VERSION}-slim
 
-ARG VERSION=0.36.3-alpha
+ARG VERSION=0.36.5-alpha
 
 ENV APPLICATION airbyte-bootloader
 ENV VERSION ${VERSION}
diff --git a/airbyte-commons/src/main/java/io/airbyte/commons/json/JsonPaths.java b/airbyte-commons/src/main/java/io/airbyte/commons/json/JsonPaths.java
index 428299aa958b4b..0b75b981500dd4 100644
--- a/airbyte-commons/src/main/java/io/airbyte/commons/json/JsonPaths.java
+++ b/airbyte-commons/src/main/java/io/airbyte/commons/json/JsonPaths.java
@@ -42,15 +42,15 @@
  * returning a list for query results. In addition, we provide helper functions that will just
  * return a single value (see: {@link JsonPaths#getSingleValue(JsonNode, String)}). These should
  * only be used if it is not possible for a query to return more than one value.
- *
- * Note: Package private as most uses of JsonPaths seems like they can be hidden inside other
- * commons libraries (i.e. Jsons and JsonsSchemas). If this assumption proves incorrect, we can open
- * it up.
  */
-class JsonPaths {
+public class JsonPaths {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(JsonPaths.class);
 
+  static final String JSON_PATH_START_CHARACTER = "$";
+  static final String JSON_PATH_LIST_SPLAT = "[*]";
+  static final String JSON_PATH_FIELD_SEPARATOR = ".";
+
   // set default configurations at start up to match our JSON setup.
   static {
     Configuration.setDefaults(new Configuration.Defaults() {
@@ -82,6 +82,18 @@ public Set<Option> options() {
     });
   }
 
+  public static String empty() {
+    return JSON_PATH_START_CHARACTER;
+  }
+
+  public static String appendField(final String jsonPath, final String field) {
+    return jsonPath + JSON_PATH_FIELD_SEPARATOR + field;
+  }
+
+  public static String appendAppendListSplat(final String jsonPath) {
+    return jsonPath + JSON_PATH_LIST_SPLAT;
+  }
+
   /*
    * This version of the JsonPath Configuration object allows queries to return to the path of values
    * instead of the values that were found.
diff --git a/airbyte-commons/src/main/java/io/airbyte/commons/json/JsonSchemas.java b/airbyte-commons/src/main/java/io/airbyte/commons/json/JsonSchemas.java
index 9ff7ed735e14b4..103dc95af8660b 100644
--- a/airbyte-commons/src/main/java/io/airbyte/commons/json/JsonSchemas.java
+++ b/airbyte-commons/src/main/java/io/airbyte/commons/json/JsonSchemas.java
@@ -8,15 +8,51 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.airbyte.commons.io.IOs;
 import io.airbyte.commons.resources.MoreResources;
+import io.airbyte.commons.util.MoreIterators;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import lombok.extern.slf4j.Slf4j;
 
+// todo (cgardens) - we need the ability to identify jsonschemas that Airbyte considers invalid for
+// a connector (e.g. "not" keyword).
+@Slf4j
 public class JsonSchemas {
 
+  private static final String JSON_SCHEMA_ENUM_KEY = "enum";
+  private static final String JSON_SCHEMA_TYPE_KEY = "type";
+  private static final String JSON_SCHEMA_PROPERTIES_KEY = "properties";
+  private static final String JSON_SCHEMA_ITEMS_KEY = "items";
+
+  // all JSONSchema types.
+  private static final String ARRAY_TYPE = "array";
+  private static final String OBJECT_TYPE = "object";
+  private static final String STRING_TYPE = "string";
+  private static final String NUMBER_TYPE = "number";
+  private static final String BOOLEAN_TYPE = "boolean";
+  private static final String NULL_TYPE = "null";
+  private static final String ONE_OF_TYPE = "oneOf";
+  private static final String ALL_OF_TYPE = "allOf";
+  private static final String ANY_OF_TYPE = "anyOf";
+
+  private static final String ARRAY_JSON_PATH = "[]";
+
+  private static final Set<String> COMPOSITE_KEYWORDS = Set.of(ONE_OF_TYPE, ALL_OF_TYPE, ANY_OF_TYPE);
+
   /**
    * JsonSchema supports to ways of declaring type. `type: "string"` and `type: ["null", "string"]`.
    * This method will mutate a JsonNode with a type field so that the output type is the array
@@ -25,16 +61,16 @@ public class JsonSchemas {
    * @param jsonNode - a json object with children that contain types.
    */
   public static void mutateTypeToArrayStandard(final JsonNode jsonNode) {
-    if (jsonNode.get("type") != null && !jsonNode.get("type").isArray()) {
-      final JsonNode type = jsonNode.get("type");
-      ((ObjectNode) jsonNode).putArray("type").add(type);
+    if (jsonNode.get(JSON_SCHEMA_TYPE_KEY) != null && !jsonNode.get(JSON_SCHEMA_TYPE_KEY).isArray()) {
+      final JsonNode type = jsonNode.get(JSON_SCHEMA_TYPE_KEY);
+      ((ObjectNode) jsonNode).putArray(JSON_SCHEMA_TYPE_KEY).add(type);
     }
   }
 
   /*
-   * JsonReferenceProcessor relies on all of the json in consumes being in a file system (not in a
-   * jar). This method copies all of the json configs out of the jar into a temporary directory so
-   * that JsonReferenceProcessor can find them.
+   * JsonReferenceProcessor relies on all the json in consumes being in a file system (not in a jar).
+   * This method copies all the json configs out of the jar into a temporary directory so that
+   * JsonReferenceProcessor can find them.
    */
   public static <T> Path prepareSchemas(final String resourceDir, final Class<T> klass) {
     try {
@@ -59,4 +95,141 @@ public static <T> Path prepareSchemas(final String resourceDir, final Class<T> k
     }
   }
 
+  public static void traverseJsonSchema(final JsonNode jsonSchemaNode, final BiConsumer<JsonNode, String> consumer) {
+    traverseJsonSchemaInternal(jsonSchemaNode, JsonPaths.empty(), consumer);
+  }
+
+  /**
+   * Traverse a JsonSchema object. At each node, optionally map a value.
+   *
+   * @param jsonSchema - JsonSchema object to traverse
+   * @param mapper - accepts the current node and the path to that node. if it returns an empty
+   *        optional, nothing will be collected, otherwise, whatever is returned will be collected and
+   *        returned by the final collection.
+   * @param <T> - type of objects being collected
+   * @return - collection of all items that were collected during the traversal. Returns a { @link
+   *         Collection } because there is no order or uniqueness guarantee so neither List nor Set
+   *         make sense.
+   */
+  public static <T> Collection<T> traverseJsonSchemaWithCollector(final JsonNode jsonSchema, final BiFunction<JsonNode, String, Optional<T>> mapper) {
+    final List<T> collectors = new ArrayList<>();
+    traverseJsonSchema(jsonSchema, (node, path) -> mapper.apply(node, path).ifPresent(collectors::add));
+    return collectors;
+  }
+
+  /**
+   * Traverses a JsonSchema object. It returns the path to each node that meet the provided condition.
+   * The paths are return in JsonPath format
+   *
+   * @param obj - JsonSchema object to traverse
+   * @param predicate - predicate to determine if the path for a node should be collected.
+   * @return - collection of all paths that were collected during the traversal.
+   */
+  public static Set<String> collectJsonPathsThatMeetCondition(final JsonNode obj, final Predicate<JsonNode> predicate) {
+    return new HashSet<>(traverseJsonSchemaWithCollector(obj, (node, path) -> {
+      if (predicate.test(node)) {
+        return Optional.of(path);
+      } else {
+        return Optional.empty();
+      }
+    }));
+  }
+
+  /**
+   * Recursive, depth-first implementation of { @link JsonSchemas#traverseJsonSchema(final JsonNode
+   * jsonNode, final BiConsumer<JsonNode, List<String>> consumer) }. Takes path as argument so that
+   * the path can be passsed to the consumer.
+   *
+   * @param jsonSchemaNode - jsonschema object to traverse.
+   * @param path - path from the first call of traverseJsonSchema to the current node.
+   * @param consumer - consumer to be called at each node. it accepts the current node and the path to
+   *        the node from the root of the object passed at the root level invocation
+   */
+  // todo (cgardens) - replace with easier to understand traversal logic from SecretsHelper.
+  private static void traverseJsonSchemaInternal(final JsonNode jsonSchemaNode,
+                                                 final String path,
+                                                 final BiConsumer<JsonNode, String> consumer) {
+    if (!jsonSchemaNode.isObject()) {
+      throw new IllegalArgumentException(String.format("json schema nodes should always be object nodes. path: %s actual: %s", path, jsonSchemaNode));
+    }
+
+    consumer.accept(jsonSchemaNode, path);
+    // if type is missing assume object. not official JsonSchema, but it seems to be a common
+    // compromise.
+    final List<String> nodeTypes = getTypeOrObject(jsonSchemaNode);
+
+    for (final String nodeType : nodeTypes) {
+      switch (nodeType) {
+        // case BOOLEAN_TYPE, NUMBER_TYPE, STRING_TYPE, NULL_TYPE -> do nothing after consumer.accept above.
+        case ARRAY_TYPE -> {
+          final String newPath = JsonPaths.appendAppendListSplat(path);
+          // hit every node.
+          // log.error("array: " + jsonSchemaNode);
+          traverseJsonSchemaInternal(jsonSchemaNode.get(JSON_SCHEMA_ITEMS_KEY), newPath, consumer);
+        }
+        case OBJECT_TYPE -> {
+          final Optional<String> comboKeyWordOptional = getKeywordIfComposite(jsonSchemaNode);
+          if (jsonSchemaNode.has(JSON_SCHEMA_PROPERTIES_KEY)) {
+            for (final Iterator<Entry<String, JsonNode>> it = jsonSchemaNode.get(JSON_SCHEMA_PROPERTIES_KEY).fields(); it.hasNext();) {
+              final Entry<String, JsonNode> child = it.next();
+              final String newPath = JsonPaths.appendField(path, child.getKey());
+              // log.error("obj1: " + jsonSchemaNode);
+              traverseJsonSchemaInternal(child.getValue(), newPath, consumer);
+            }
+          } else if (comboKeyWordOptional.isPresent()) {
+            for (final JsonNode arrayItem : jsonSchemaNode.get(comboKeyWordOptional.get())) {
+              // log.error("obj2: " + jsonSchemaNode);
+              traverseJsonSchemaInternal(arrayItem, path, consumer);
+            }
+          } else {
+            throw new IllegalArgumentException(
+                "malformed JsonSchema object type, must have one of the following fields: properties, oneOf, allOf, anyOf in " + jsonSchemaNode);
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * If the object uses JSONSchema composite functionality (e.g. oneOf, anyOf, allOf), detect it and
+   * return which one it is using.
+   *
+   * @param node - object to detect use of composite functionality.
+   * @return the composite functionality being used, if not using composite functionality, empty.
+   */
+  private static Optional<String> getKeywordIfComposite(final JsonNode node) {
+    for (final String keyWord : COMPOSITE_KEYWORDS) {
+      if (node.has(keyWord)) {
+        return Optional.ofNullable(keyWord);
+      }
+    }
+    return Optional.empty();
+  }
+
+  public static List<String> getTypeOrObject(final JsonNode jsonNode) {
+    final List<String> types = getType(jsonNode);
+    if (types.isEmpty()) {
+      return List.of(OBJECT_TYPE);
+    } else {
+      return types;
+    }
+  }
+
+  public static List<String> getType(final JsonNode jsonNode) {
+    if (jsonNode.has(JSON_SCHEMA_TYPE_KEY)) {
+      if (jsonNode.get(JSON_SCHEMA_TYPE_KEY).isArray()) {
+        return MoreIterators.toList(jsonNode.get(JSON_SCHEMA_TYPE_KEY).iterator())
+            .stream()
+            .map(JsonNode::asText)
+            .collect(Collectors.toList());
+      } else {
+        return List.of(jsonNode.get(JSON_SCHEMA_TYPE_KEY).asText());
+      }
+    }
+    if (jsonNode.has(JSON_SCHEMA_ENUM_KEY)) {
+      return List.of(STRING_TYPE);
+    }
+    return Collections.emptyList();
+  }
+
 }
diff --git a/airbyte-commons/src/test/java/io/airbyte/commons/json/JsonSchemasTest.java b/airbyte-commons/src/test/java/io/airbyte/commons/json/JsonSchemasTest.java
new file mode 100644
index 00000000000000..e974612bb33c68
--- /dev/null
+++ b/airbyte-commons/src/test/java/io/airbyte/commons/json/JsonSchemasTest.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.commons.json;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import io.airbyte.commons.resources.MoreResources;
+import java.io.IOException;
+import java.util.function.BiConsumer;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.mockito.InOrder;
+import org.mockito.Mockito;
+
+class JsonSchemasTest {
+
+  @Test
+  void testMutateTypeToArrayStandard() {
+    final JsonNode expectedWithoutType = Jsons.deserialize("{\"test\":\"abc\"}");
+    final JsonNode actualWithoutType = Jsons.clone(expectedWithoutType);
+    JsonSchemas.mutateTypeToArrayStandard(expectedWithoutType);
+    assertEquals(expectedWithoutType, actualWithoutType);
+
+    final JsonNode expectedWithArrayType = Jsons.deserialize("{\"test\":\"abc\", \"type\":[\"object\"]}");
+    final JsonNode actualWithArrayType = Jsons.clone(expectedWithArrayType);
+    JsonSchemas.mutateTypeToArrayStandard(actualWithArrayType);
+    assertEquals(expectedWithoutType, actualWithoutType);
+
+    final JsonNode expectedWithoutArrayType = Jsons.deserialize("{\"test\":\"abc\", \"type\":[\"object\"]}");
+    final JsonNode actualWithStringType = Jsons.deserialize("{\"test\":\"abc\", \"type\":\"object\"}");
+    JsonSchemas.mutateTypeToArrayStandard(actualWithStringType);
+    assertEquals(expectedWithoutArrayType, actualWithStringType);
+  }
+
+  @SuppressWarnings("unchecked")
+  @Test
+  void testTraverse() throws IOException {
+    final JsonNode jsonWithAllTypes = Jsons.deserialize(MoreResources.readResource("json_schemas/json_with_all_types.json"));
+    final BiConsumer<JsonNode, String> mock = mock(BiConsumer.class);
+
+    JsonSchemas.traverseJsonSchema(jsonWithAllTypes, mock);
+    final InOrder inOrder = Mockito.inOrder(mock);
+    inOrder.verify(mock).accept(jsonWithAllTypes, JsonPaths.empty());
+    inOrder.verify(mock).accept(jsonWithAllTypes.get("properties").get("name"), "$.name");
+    inOrder.verify(mock).accept(jsonWithAllTypes.get("properties").get("name").get("properties").get("first"), "$.name.first");
+    inOrder.verify(mock).accept(jsonWithAllTypes.get("properties").get("name").get("properties").get("last"), "$.name.last");
+    inOrder.verify(mock).accept(jsonWithAllTypes.get("properties").get("company"), "$.company");
+    inOrder.verify(mock).accept(jsonWithAllTypes.get("properties").get("pets"), "$.pets");
+    inOrder.verify(mock).accept(jsonWithAllTypes.get("properties").get("pets").get("items"), "$.pets[*]");
+    inOrder.verify(mock).accept(jsonWithAllTypes.get("properties").get("pets").get("items").get("properties").get("type"), "$.pets[*].type");
+    inOrder.verify(mock).accept(jsonWithAllTypes.get("properties").get("pets").get("items").get("properties").get("number"), "$.pets[*].number");
+    inOrder.verifyNoMoreInteractions();
+  }
+
+  @SuppressWarnings("unchecked")
+  @ValueSource(strings = {
+    "anyOf",
+    "oneOf",
+    "allOf"
+  })
+  @ParameterizedTest
+  void testTraverseComposite(final String compositeKeyword) throws IOException {
+    final String jsonSchemaString = MoreResources.readResource("json_schemas/composite_json_schema.json")
+        .replaceAll("<composite-placeholder>", compositeKeyword);
+    final JsonNode jsonWithAllTypes = Jsons.deserialize(jsonSchemaString);
+    final BiConsumer<JsonNode, String> mock = mock(BiConsumer.class);
+
+    JsonSchemas.traverseJsonSchema(jsonWithAllTypes, mock);
+
+    final InOrder inOrder = Mockito.inOrder(mock);
+    inOrder.verify(mock).accept(jsonWithAllTypes, JsonPaths.empty());
+    inOrder.verify(mock).accept(jsonWithAllTypes.get(compositeKeyword).get(0), JsonPaths.empty());
+    inOrder.verify(mock).accept(jsonWithAllTypes.get(compositeKeyword).get(1), JsonPaths.empty());
+    inOrder.verify(mock).accept(jsonWithAllTypes.get(compositeKeyword).get(1).get("properties").get("prop1"), "$.prop1");
+    inOrder.verify(mock).accept(jsonWithAllTypes.get(compositeKeyword).get(2), JsonPaths.empty());
+    inOrder.verify(mock).accept(jsonWithAllTypes.get(compositeKeyword).get(2).get("items"), "$[*]");
+    inOrder.verify(mock).accept(jsonWithAllTypes.get(compositeKeyword).get(3).get(compositeKeyword).get(0), JsonPaths.empty());
+    inOrder.verify(mock).accept(jsonWithAllTypes.get(compositeKeyword).get(3).get(compositeKeyword).get(1), JsonPaths.empty());
+    inOrder.verify(mock).accept(jsonWithAllTypes.get(compositeKeyword).get(3).get(compositeKeyword).get(1).get("items"), "$[*]");
+    inOrder.verifyNoMoreInteractions();
+  }
+
+  @SuppressWarnings("unchecked")
+  @Test
+  void testTraverseMultiType() throws IOException {
+    final JsonNode jsonWithAllTypes = Jsons.deserialize(MoreResources.readResource("json_schemas/json_with_array_type_fields.json"));
+    final BiConsumer<JsonNode, String> mock = mock(BiConsumer.class);
+
+    JsonSchemas.traverseJsonSchema(jsonWithAllTypes, mock);
+    final InOrder inOrder = Mockito.inOrder(mock);
+    inOrder.verify(mock).accept(jsonWithAllTypes, JsonPaths.empty());
+    inOrder.verify(mock).accept(jsonWithAllTypes.get("properties").get("company"), "$.company");
+    inOrder.verify(mock).accept(jsonWithAllTypes.get("items"), "$[*]");
+    inOrder.verify(mock).accept(jsonWithAllTypes.get("items").get("properties").get("user"), "$[*].user");
+    inOrder.verifyNoMoreInteractions();
+  }
+
+  @SuppressWarnings("unchecked")
+  @Test
+  void testTraverseMultiTypeComposite() throws IOException {
+    final String compositeKeyword = "anyOf";
+    final JsonNode jsonWithAllTypes = Jsons.deserialize(MoreResources.readResource("json_schemas/json_with_array_type_fields_with_composites.json"));
+    final BiConsumer<JsonNode, String> mock = mock(BiConsumer.class);
+
+    JsonSchemas.traverseJsonSchema(jsonWithAllTypes, mock);
+
+    final InOrder inOrder = Mockito.inOrder(mock);
+    inOrder.verify(mock).accept(jsonWithAllTypes, JsonPaths.empty());
+    inOrder.verify(mock).accept(jsonWithAllTypes.get(compositeKeyword).get(0).get("properties").get("company"), "$.company");
+    inOrder.verify(mock).accept(jsonWithAllTypes.get(compositeKeyword).get(1).get("properties").get("organization"), "$.organization");
+    inOrder.verify(mock).accept(jsonWithAllTypes.get("items"), "$[*]");
+    inOrder.verify(mock).accept(jsonWithAllTypes.get("items").get("properties").get("user"), "$[*].user");
+    inOrder.verifyNoMoreInteractions();
+  }
+
+}
diff --git a/airbyte-commons/src/test/java/io/airbyte/commons/json/JsonsTest.java b/airbyte-commons/src/test/java/io/airbyte/commons/json/JsonsTest.java
index 8ae3b104f58a71..4dbc291f9e7b43 100644
--- a/airbyte-commons/src/test/java/io/airbyte/commons/json/JsonsTest.java
+++ b/airbyte-commons/src/test/java/io/airbyte/commons/json/JsonsTest.java
@@ -186,24 +186,6 @@ void testClone() {
     assertEquals(expected, actual);
   }
 
-  @Test
-  void testMutateTypeToArrayStandard() {
-    final JsonNode expectedWithoutType = Jsons.deserialize("{\"test\":\"abc\"}");
-    final JsonNode actualWithoutType = Jsons.clone(expectedWithoutType);
-    JsonSchemas.mutateTypeToArrayStandard(expectedWithoutType);
-    assertEquals(expectedWithoutType, actualWithoutType);
-
-    final JsonNode expectedWithArrayType = Jsons.deserialize("{\"test\":\"abc\", \"type\":[\"object\"]}");
-    final JsonNode actualWithArrayType = Jsons.clone(expectedWithArrayType);
-    JsonSchemas.mutateTypeToArrayStandard(actualWithArrayType);
-    assertEquals(expectedWithoutType, actualWithoutType);
-
-    final JsonNode expectedWithoutArrayType = Jsons.deserialize("{\"test\":\"abc\", \"type\":[\"object\"]}");
-    final JsonNode actualWithStringType = Jsons.deserialize("{\"test\":\"abc\", \"type\":\"object\"}");
-    JsonSchemas.mutateTypeToArrayStandard(actualWithStringType);
-    assertEquals(expectedWithoutArrayType, actualWithStringType);
-  }
-
   @Test
   void testToBytes() {
     final String jsonString = "{\"test\":\"abc\",\"type\":[\"object\"]}";
diff --git a/airbyte-commons/src/test/resources/json_schemas/composite_json_schema.json b/airbyte-commons/src/test/resources/json_schemas/composite_json_schema.json
new file mode 100644
index 00000000000000..ba2ec2918e36a0
--- /dev/null
+++ b/airbyte-commons/src/test/resources/json_schemas/composite_json_schema.json
@@ -0,0 +1,39 @@
+{
+  "<composite-placeholder>": [
+    {
+      "type": "string",
+      "description": "top level"
+    },
+    {
+      "type": "object",
+      "properties": {
+        "prop1": {
+          "type": "string"
+        }
+      }
+    },
+    {
+      "type": "array",
+      "items": {
+        "type": "string",
+        "description": "in array"
+      }
+    },
+    {
+      "type": "object",
+      "<composite-placeholder>": [
+        {
+          "type": "string",
+          "description": "once nested"
+        },
+        {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "description": "nested in array"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/airbyte-commons/src/test/resources/json_schemas/json_with_all_types.json b/airbyte-commons/src/test/resources/json_schemas/json_with_all_types.json
new file mode 100644
index 00000000000000..53c385817eaa1f
--- /dev/null
+++ b/airbyte-commons/src/test/resources/json_schemas/json_with_all_types.json
@@ -0,0 +1,34 @@
+{
+  "title": "Jackson founder",
+  "type": "object",
+  "properties": {
+    "name": {
+      "type": "object",
+      "properties": {
+        "first": {
+          "type": "string"
+        },
+        "last": {
+          "type": "string"
+        }
+      }
+    },
+    "company": {
+      "type": "string"
+    },
+    "pets": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "number": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/airbyte-commons/src/test/resources/json_schemas/json_with_array_type_fields.json b/airbyte-commons/src/test/resources/json_schemas/json_with_array_type_fields.json
new file mode 100644
index 00000000000000..56748ecc13751d
--- /dev/null
+++ b/airbyte-commons/src/test/resources/json_schemas/json_with_array_type_fields.json
@@ -0,0 +1,18 @@
+{
+  "type": ["object", "array", "string"],
+  "properties": {
+    "company": {
+      "type": "string",
+      "description": "company name"
+    }
+  },
+  "items": {
+    "type": "object",
+    "properties": {
+      "user": {
+        "type": "string",
+        "description": "username"
+      }
+    }
+  }
+}
diff --git a/airbyte-commons/src/test/resources/json_schemas/json_with_array_type_fields_with_composites.json b/airbyte-commons/src/test/resources/json_schemas/json_with_array_type_fields_with_composites.json
new file mode 100644
index 00000000000000..9fcab7b1006bfe
--- /dev/null
+++ b/airbyte-commons/src/test/resources/json_schemas/json_with_array_type_fields_with_composites.json
@@ -0,0 +1,32 @@
+{
+  "type": ["object", "array", "string"],
+  "anyOf": [
+    {
+      "type": "object",
+      "properties": {
+        "company": {
+          "type": "string",
+          "description": "company name"
+        }
+      }
+    },
+    {
+      "type": "object",
+      "properties": {
+        "organization": {
+          "type": "string",
+          "description": "organization name"
+        }
+      }
+    }
+  ],
+  "items": {
+    "type": "object",
+    "properties": {
+      "user": {
+        "type": "string",
+        "description": "username"
+      }
+    }
+  }
+}
diff --git a/airbyte-config/init/src/main/resources/seed/destination_definitions.yaml b/airbyte-config/init/src/main/resources/seed/destination_definitions.yaml
index bcf75228f11348..e9f195a598225e 100644
--- a/airbyte-config/init/src/main/resources/seed/destination_definitions.yaml
+++ b/airbyte-config/init/src/main/resources/seed/destination_definitions.yaml
@@ -167,7 +167,7 @@
 - name: Postgres
   destinationDefinitionId: 25c5221d-dce2-4163-ade9-739ef790f503
   dockerRepository: airbyte/destination-postgres
-  dockerImageTag: 0.3.18
+  dockerImageTag: 0.3.19
   documentationUrl: https://docs.airbyte.io/integrations/destinations/postgres
   icon: postgresql.svg
 - name: Pulsar
diff --git a/airbyte-config/init/src/main/resources/seed/destination_specs.yaml b/airbyte-config/init/src/main/resources/seed/destination_specs.yaml
index af9b9c4fb3d5ff..dfa8a93846274e 100644
--- a/airbyte-config/init/src/main/resources/seed/destination_specs.yaml
+++ b/airbyte-config/init/src/main/resources/seed/destination_specs.yaml
@@ -3047,7 +3047,7 @@
     supported_destination_sync_modes:
     - "overwrite"
     - "append"
-- dockerImage: "airbyte/destination-postgres:0.3.18"
+- dockerImage: "airbyte/destination-postgres:0.3.19"
   spec:
     documentationUrl: "https://docs.airbyte.io/integrations/destinations/postgres"
     connectionSpecification:
diff --git a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml
index a021f9fce2f315..7a6d3fba64f361 100644
--- a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml
+++ b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml
@@ -15,7 +15,7 @@
 - name: Amazon Ads
   sourceDefinitionId: c6b0a29e-1da9-4512-9002-7bfd0cba2246
   dockerRepository: airbyte/source-amazon-ads
-  dockerImageTag: 0.1.6
+  dockerImageTag: 0.1.7
   documentationUrl: https://docs.airbyte.io/integrations/sources/amazon-ads
   icon: amazonads.svg
   sourceType: api
@@ -35,14 +35,14 @@
 - name: Amplitude
   sourceDefinitionId: fa9f58c6-2d03-4237-aaa4-07d75e0c1396
   dockerRepository: airbyte/source-amplitude
-  dockerImageTag: 0.1.4
+  dockerImageTag: 0.1.5
   documentationUrl: https://docs.airbyte.io/integrations/sources/amplitude
   icon: amplitude.svg
   sourceType: api
 - name: Apify Dataset
   sourceDefinitionId: 47f17145-fe20-4ef5-a548-e29b048adf84
   dockerRepository: airbyte/source-apify-dataset
-  dockerImageTag: 0.1.9
+  dockerImageTag: 0.1.11
   documentationUrl: https://docs.airbyte.io/integrations/sources/apify-dataset
   icon: apify.svg
   sourceType: api
@@ -272,7 +272,7 @@
 - name: Google Ads
   sourceDefinitionId: 253487c0-2246-43ba-a21f-5116b20a2c50
   dockerRepository: airbyte/source-google-ads
-  dockerImageTag: 0.1.35
+  dockerImageTag: 0.1.36
   documentationUrl: https://docs.airbyte.io/integrations/sources/google-ads
   icon: google-adwords.svg
   sourceType: api
@@ -341,7 +341,7 @@
 - name: HubSpot
   sourceDefinitionId: 36c891d9-4bd9-43ac-bad2-10e12756272c
   dockerRepository: airbyte/source-hubspot
-  dockerImageTag: 0.1.53
+  dockerImageTag: 0.1.55
   documentationUrl: https://docs.airbyte.io/integrations/sources/hubspot
   icon: hubspot.svg
   sourceType: api
@@ -473,7 +473,7 @@
 - name: Mixpanel
   sourceDefinitionId: 12928b32-bf0a-4f1e-964f-07e12e37153a
   dockerRepository: airbyte/source-mixpanel
-  dockerImageTag: 0.1.12
+  dockerImageTag: 0.1.13
   documentationUrl: https://docs.airbyte.io/integrations/sources/mixpanel
   icon: mixpanel.svg
   sourceType: api
@@ -529,7 +529,7 @@
 - name: OpenWeather
   sourceDefinitionId: d8540a80-6120-485d-b7d6-272bca477d9b
   dockerRepository: airbyte/source-openweather
-  dockerImageTag: 0.1.1
+  dockerImageTag: 0.1.4
   documentationUrl: https://docs.airbyte.io/integrations/sources/openweather
   sourceType: api
 - name: Oracle DB
@@ -563,7 +563,7 @@
 - name: Paypal Transaction
   sourceDefinitionId: d913b0f2-cc51-4e55-a44c-8ba1697b9239
   dockerRepository: airbyte/source-paypal-transaction
-  dockerImageTag: 0.1.4
+  dockerImageTag: 0.1.5
   documentationUrl: https://docs.airbyte.io/integrations/sources/paypal-transaction
   icon: paypal.svg
   sourceType: api
@@ -695,7 +695,7 @@
 - name: Salesforce
   sourceDefinitionId: b117307c-14b6-41aa-9422-947e34922962
   dockerRepository: airbyte/source-salesforce
-  dockerImageTag: 1.0.5
+  dockerImageTag: 1.0.6
   documentationUrl: https://docs.airbyte.io/integrations/sources/salesforce
   icon: salesforce.svg
   sourceType: api
@@ -737,7 +737,7 @@
 - name: Smartsheets
   sourceDefinitionId: 374ebc65-6636-4ea0-925c-7d35999a8ffc
   dockerRepository: airbyte/source-smartsheets
-  dockerImageTag: 0.1.9
+  dockerImageTag: 0.1.10
   documentationUrl: https://docs.airbyte.io/integrations/sources/smartsheets
   icon: smartsheet.svg
   sourceType: api
@@ -751,7 +751,7 @@
 - name: Snowflake
   sourceDefinitionId: e2d65910-8c8b-40a1-ae7d-ee2416b2bfa2
   dockerRepository: airbyte/source-snowflake
-  dockerImageTag: 0.1.10
+  dockerImageTag: 0.1.11
   documentationUrl: https://docs.airbyte.io/integrations/sources/snowflake
   icon: snowflake.svg
   sourceType: database
@@ -799,7 +799,7 @@
 - name: TikTok Marketing
   sourceDefinitionId: 4bfac00d-ce15-44ff-95b9-9e3c3e8fbd35
   dockerRepository: airbyte/source-tiktok-marketing
-  dockerImageTag: 0.1.6
+  dockerImageTag: 0.1.7
   documentationUrl: https://docs.airbyte.io/integrations/sources/tiktok-marketing
   icon: tiktok.svg
   sourceType: api
@@ -862,7 +862,7 @@
 - name: Zendesk Support
   sourceDefinitionId: 79c1aa37-dae3-42ae-b333-d1c105477715
   dockerRepository: airbyte/source-zendesk-support
-  dockerImageTag: 0.2.6
+  dockerImageTag: 0.2.7
   documentationUrl: https://docs.airbyte.io/integrations/sources/zendesk-support
   icon: zendesk.svg
   sourceType: api
diff --git a/airbyte-config/init/src/main/resources/seed/source_specs.yaml b/airbyte-config/init/src/main/resources/seed/source_specs.yaml
index d69af5d6f59990..295060f93df643 100644
--- a/airbyte-config/init/src/main/resources/seed/source_specs.yaml
+++ b/airbyte-config/init/src/main/resources/seed/source_specs.yaml
@@ -87,9 +87,9 @@
     supportsNormalization: false
     supportsDBT: false
     supported_destination_sync_modes: []
-- dockerImage: "airbyte/source-amazon-ads:0.1.6"
+- dockerImage: "airbyte/source-amazon-ads:0.1.7"
   spec:
-    documentationUrl: "https://docs.airbyte.io/integrations/sources/amazon-ads"
+    documentationUrl: "https://docs.airbyte.com/integrations/sources/amazon-ads"
     connectionSpecification:
       title: "Amazon Ads Spec"
       type: "object"
@@ -100,72 +100,73 @@
           order: 0
           type: "string"
         client_id:
-          title: "Client Id"
-          description: "Oauth client id <a href=\"https://advertising.amazon.com/API/docs/en-us/setting-up/step-1-create-lwa-app\"\
-            >How to create your Login with Amazon</a>"
-          name: "Client ID"
+          title: "Client ID"
+          description: "The Client ID of your Amazon Ads developer application."
+          order: 1
           type: "string"
         client_secret:
           title: "Client Secret"
-          description: "Oauth client secret <a href=\"https://advertising.amazon.com/API/docs/en-us/setting-up/step-1-create-lwa-app\"\
-            >How to create your Login with Amazon</a>"
-          name: "Client secret"
+          description: "The Client Secret of your Amazon Ads developer application."
           airbyte_secret: true
+          order: 2
           type: "string"
         refresh_token:
           title: "Refresh Token"
-          description: "Oauth 2.0 refresh_token, <a href=\"https://developer.amazon.com/docs/login-with-amazon/conceptual-overview.html\"\
-            >read details here</a>"
-          name: "Oauth refresh token"
+          description: "Amazon Ads Refresh Token. See the <a href=\"https://docs.airbyte.com/integrations/sources/amazon-ads\"\
+            >docs</a> for more information on how to obtain this token."
           airbyte_secret: true
-          type: "string"
-        start_date:
-          title: "Start Date"
-          description: "Start date for collectiong reports, should not be more than\
-            \ 60 days in past. In YYYY-MM-DD format"
-          name: "Start date"
-          examples:
-          - "2022-10-10"
-          - "2022-10-22"
+          order: 3
           type: "string"
         region:
-          description: "An enumeration."
-          default: "NA"
-          name: "Region"
-          title: "AmazonAdsRegion"
+          title: "Region *"
+          description: "Region to pull data from (EU/NA/FE/SANDBOX). See <a href=\"\
+            https://advertising.amazon.com/API/docs/en-us/info/api-overview#api-endpoints\"\
+            >docs</a> for more details."
           enum:
           - "NA"
           - "EU"
           - "FE"
           - "SANDBOX"
           type: "string"
-        profiles:
-          title: "Profiles"
-          description: "profile Ids you want to fetch data for"
-          name: "Profile Ids"
-          type: "array"
-          items:
-            type: "integer"
+          default: "NA"
+          order: 4
         report_wait_timeout:
-          title: "Report Wait Timeout"
+          title: "Report Wait Timeout *"
           description: "Timeout duration in minutes for Reports. Eg. 30"
           default: 30
-          name: "Report Wait Timeout"
           examples:
           - 30
           - 120
+          order: 5
           type: "integer"
         report_generation_max_retries:
-          title: "Report Generation Max Retries"
+          title: "Report Generation Maximum Retries *"
           description: "Maximum retries Airbyte will attempt for fetching Report Data.\
             \ Eg. 5"
           default: 5
-          name: "Report Geration Maximum Retries"
           examples:
           - 5
           - 10
           - 15
+          order: 6
           type: "integer"
+        start_date:
+          title: "Start Date (Optional)"
+          description: "The Start date for collecting reports, should not be more\
+            \ than 60 days in the past. In YYYY-MM-DD format"
+          examples:
+          - "2022-10-10"
+          - "2022-10-22"
+          order: 7
+          type: "string"
+        profiles:
+          title: "Profile IDs (Optional)"
+          description: "Profile IDs you want to fetch data for. See <a href=\"https://advertising.amazon.com/API/docs/en-us/concepts/authorization/profiles\"\
+            >docs</a> for more details."
+          order: 8
+          type: "array"
+          items:
+            type: "integer"
       required:
       - "client_id"
       - "client_secret"
@@ -475,7 +476,7 @@
     supportsNormalization: false
     supportsDBT: false
     supported_destination_sync_modes: []
-- dockerImage: "airbyte/source-amplitude:0.1.4"
+- dockerImage: "airbyte/source-amplitude:0.1.5"
   spec:
     documentationUrl: "https://docs.airbyte.io/integrations/sources/amplitude"
     connectionSpecification:
@@ -511,7 +512,7 @@
     supportsNormalization: false
     supportsDBT: false
     supported_destination_sync_modes: []
-- dockerImage: "airbyte/source-apify-dataset:0.1.9"
+- dockerImage: "airbyte/source-apify-dataset:0.1.11"
   spec:
     documentationUrl: "https://docs.airbyte.io/integrations/sources/apify-dataset"
     connectionSpecification:
@@ -2387,6 +2388,7 @@
             \ account."
         start_date:
           title: "Start Date"
+          type: "string"
           description: "UTC date and time. Any data created after this date will be\
             \ replicated. If this parameter is not set, all data will be replicated."
           format: "date-time"
@@ -2643,7 +2645,7 @@
     supportsNormalization: false
     supportsDBT: false
     supported_destination_sync_modes: []
-- dockerImage: "airbyte/source-google-ads:0.1.35"
+- dockerImage: "airbyte/source-google-ads:0.1.36"
   spec:
     documentationUrl: "https://docs.airbyte.com/integrations/sources/google-ads"
     connectionSpecification:
@@ -3479,7 +3481,7 @@
     supportsNormalization: false
     supportsDBT: false
     supported_destination_sync_modes: []
-- dockerImage: "airbyte/source-hubspot:0.1.53"
+- dockerImage: "airbyte/source-hubspot:0.1.55"
   spec:
     documentationUrl: "https://docs.airbyte.io/integrations/sources/hubspot"
     connectionSpecification:
@@ -5023,7 +5025,7 @@
               path_in_connector_config:
               - "credentials"
               - "client_secret"
-- dockerImage: "airbyte/source-mixpanel:0.1.12"
+- dockerImage: "airbyte/source-mixpanel:0.1.13"
   spec:
     documentationUrl: "https://docs.airbyte.io/integrations/sources/mixpanel"
     connectionSpecification:
@@ -5637,7 +5639,7 @@
     supportsNormalization: false
     supportsDBT: false
     supported_destination_sync_modes: []
-- dockerImage: "airbyte/source-openweather:0.1.1"
+- dockerImage: "airbyte/source-openweather:0.1.4"
   spec:
     documentationUrl: "https://docsurl.com"
     connectionSpecification:
@@ -6121,7 +6123,7 @@
     supportsNormalization: false
     supportsDBT: false
     supported_destination_sync_modes: []
-- dockerImage: "airbyte/source-paypal-transaction:0.1.4"
+- dockerImage: "airbyte/source-paypal-transaction:0.1.5"
   spec:
     documentationUrl: "https://docs.airbyte.io/integrations/sources/paypal-transactions"
     connectionSpecification:
@@ -7345,7 +7347,7 @@
     supportsNormalization: false
     supportsDBT: false
     supported_destination_sync_modes: []
-- dockerImage: "airbyte/source-salesforce:1.0.5"
+- dockerImage: "airbyte/source-salesforce:1.0.6"
   spec:
     documentationUrl: "https://docs.airbyte.com/integrations/sources/salesforce"
     connectionSpecification:
@@ -7771,6 +7773,9 @@
         channel_filter:
           type: "array"
           default: []
+          items:
+            type: "string"
+            min-item: 0
           title: "Channel name filter"
           description: "A channel name list (without leading '#' char) which limit\
             \ the channels from which you'd like to sync. Empty list means no filter."
@@ -7856,7 +7861,7 @@
         oauthFlowOutputParameters:
         - - "access_token"
         - - "refresh_token"
-- dockerImage: "airbyte/source-smartsheets:0.1.9"
+- dockerImage: "airbyte/source-smartsheets:0.1.10"
   spec:
     documentationUrl: "https://docs.airbyte.io/integrations/sources/smartsheets"
     connectionSpecification:
@@ -7878,6 +7883,15 @@
           title: "Sheet ID"
           description: "The spreadsheet ID. Find in the spreadsheet menu: File > Properties"
           type: "string"
+        start_datetime:
+          title: "Start Datetime"
+          type: "string"
+          examples:
+          - "2000-01-01T13:00:00"
+          - "2000-01-01T13:00:00-07:00"
+          description: "ISO 8601, for instance: `YYYY-MM-DDTHH:MM:SS`, `YYYY-MM-DDTHH:MM:SS+HH:MM`"
+          format: "date-time"
+          default: "2020-01-01T00:00:00+00:00"
     supportsNormalization: false
     supportsDBT: false
     supported_destination_sync_modes: []
@@ -7955,7 +7969,7 @@
         - - "client_secret"
         oauthFlowOutputParameters:
         - - "refresh_token"
-- dockerImage: "airbyte/source-snowflake:0.1.10"
+- dockerImage: "airbyte/source-snowflake:0.1.11"
   spec:
     documentationUrl: "https://docs.airbyte.io/integrations/sources/snowflake"
     connectionSpecification:
@@ -7968,10 +7982,77 @@
       - "warehouse"
       - "database"
       - "schema"
-      - "username"
-      - "password"
-      additionalProperties: false
+      additionalProperties: true
       properties:
+        credentials:
+          title: "Authorization Method"
+          type: "object"
+          oneOf:
+          - type: "object"
+            title: "OAuth2.0"
+            order: 0
+            required:
+            - "client_id"
+            - "client_secret"
+            - "auth_type"
+            properties:
+              auth_type:
+                type: "string"
+                const: "OAuth"
+                default: "OAuth"
+                order: 0
+              client_id:
+                type: "string"
+                title: "Client ID"
+                description: "The Client ID of your Snowflake developer application."
+                airbyte_secret: true
+                order: 1
+              client_secret:
+                type: "string"
+                title: "Client Secret"
+                description: "The Client Secret of your Snowflake developer application."
+                airbyte_secret: true
+                order: 2
+              access_token:
+                type: "string"
+                title: "Access Token"
+                description: "Access Token for making authenticated requests."
+                airbyte_secret: true
+                order: 3
+              refresh_token:
+                type: "string"
+                title: "Refresh Token"
+                description: "Refresh Token for making authenticated requests."
+                airbyte_secret: true
+                order: 4
+          - title: "Username and Password"
+            type: "object"
+            required:
+            - "username"
+            - "password"
+            - "auth_type"
+            order: 1
+            properties:
+              auth_type:
+                type: "string"
+                const: "username/password"
+                default: "username/password"
+                order: 0
+              username:
+                description: "The username you created to allow Airbyte to access\
+                  \ the database."
+                examples:
+                - "AIRBYTE_USER"
+                type: "string"
+                title: "Username"
+                order: 1
+              password:
+                description: "The password associated with the username."
+                type: "string"
+                airbyte_secret: true
+                title: "Password"
+                order: 2
+          order: 0
         host:
           description: "The host domain of the snowflake instance (must include the\
             \ account, region, cloud environment, and end with snowflakecomputing.com)."
@@ -7979,58 +8060,96 @@
           - "accountname.us-east-2.aws.snowflakecomputing.com"
           type: "string"
           title: "Account Name"
-          order: 0
+          order: 1
         role:
           description: "The role you created for Airbyte to access Snowflake."
           examples:
           - "AIRBYTE_ROLE"
           type: "string"
           title: "Role"
-          order: 1
+          order: 2
         warehouse:
           description: "The warehouse you created for Airbyte to access data."
           examples:
           - "AIRBYTE_WAREHOUSE"
           type: "string"
           title: "Warehouse"
-          order: 2
+          order: 3
         database:
           description: "The database you created for Airbyte to access data."
           examples:
           - "AIRBYTE_DATABASE"
           type: "string"
           title: "Database"
-          order: 3
+          order: 4
         schema:
           description: "The source Snowflake schema tables."
           examples:
           - "AIRBYTE_SCHEMA"
           type: "string"
           title: "Schema"
-          order: 4
-        username:
-          description: "The username you created to allow Airbyte to access the database."
-          examples:
-          - "AIRBYTE_USER"
-          type: "string"
-          title: "Username"
           order: 5
-        password:
-          description: "The password associated with the username."
-          type: "string"
-          airbyte_secret: true
-          title: "Password"
-          order: 6
         jdbc_url_params:
           description: "Additional properties to pass to the JDBC URL string when\
             \ connecting to the database formatted as 'key=value' pairs separated\
             \ by the symbol '&'. (example: key1=value1&key2=value2&key3=value3)."
           title: "JDBC URL Params"
           type: "string"
-          order: 7
+          order: 6
     supportsNormalization: false
     supportsDBT: false
     supported_destination_sync_modes: []
+    advanced_auth:
+      auth_flow_type: "oauth2.0"
+      predicate_key:
+      - "credentials"
+      - "auth_type"
+      predicate_value: "OAuth"
+      oauth_config_specification:
+        oauth_user_input_from_connector_config_specification:
+          type: "object"
+          additionalProperties: false
+          properties:
+            host:
+              type: "string"
+              path_in_connector_config:
+              - "host"
+        complete_oauth_output_specification:
+          type: "object"
+          additionalProperties: false
+          properties:
+            access_token:
+              type: "string"
+              path_in_connector_config:
+              - "credentials"
+              - "access_token"
+            refresh_token:
+              type: "string"
+              path_in_connector_config:
+              - "credentials"
+              - "refresh_token"
+        complete_oauth_server_input_specification:
+          type: "object"
+          additionalProperties: false
+          properties:
+            client_id:
+              type: "string"
+            client_secret:
+              type: "string"
+        complete_oauth_server_output_specification:
+          type: "object"
+          additionalProperties: false
+          properties:
+            client_id:
+              type: "string"
+              path_in_connector_config:
+              - "credentials"
+              - "client_id"
+            client_secret:
+              type: "string"
+              path_in_connector_config:
+              - "credentials"
+              - "client_secret"
 - dockerImage: "airbyte/source-square:0.1.4"
   spec:
     documentationUrl: "https://docs.airbyte.io/integrations/sources/square"
@@ -8531,7 +8650,7 @@
     supportsNormalization: false
     supportsDBT: false
     supported_destination_sync_modes: []
-- dockerImage: "airbyte/source-tiktok-marketing:0.1.6"
+- dockerImage: "airbyte/source-tiktok-marketing:0.1.7"
   spec:
     documentationUrl: "https://docs.airbyte.io/integrations/sources/tiktok-marketing"
     changelogUrl: "https://docs.airbyte.io/integrations/sources/tiktok-marketing"
@@ -8539,31 +8658,10 @@
       title: "TikTok Marketing Source Spec"
       type: "object"
       properties:
-        start_date:
-          title: "Start Date"
-          description: "The Start Date in format: YYYY-MM-DD. Any data before this\
-            \ date will not be replicated. If this parameter is not set, all data\
-            \ will be replicated."
-          default: "2016-09-01"
-          pattern: "^[0-9]{4}-[0-9]{2}-[0-9]{2}$"
-          order: 0
-          type: "string"
-        report_granularity:
-          title: "Report Granularity"
-          description: "Which time granularity should be grouped by; for LIFETIME\
-            \ there will be no grouping. This option is used for reports' streams\
-            \ only."
-          default: "DAY"
-          enum:
-          - "LIFETIME"
-          - "DAY"
-          - "HOUR"
-          order: 1
-          type: "string"
         credentials:
-          title: "Authorization Method"
+          title: "Authentication *"
           default: {}
-          order: 3
+          order: 0
           type: "object"
           oneOf:
           - title: "OAuth2.0"
@@ -8573,8 +8671,6 @@
                 title: "Auth Type"
                 const: "oauth2.0"
                 order: 0
-                enum:
-                - "oauth2.0"
                 type: "string"
               app_id:
                 title: "App ID"
@@ -8602,8 +8698,6 @@
                 title: "Auth Type"
                 const: "prod_access_token"
                 order: 0
-                enum:
-                - "prod_access_token"
                 type: "string"
               app_id:
                 title: "App ID"
@@ -8630,8 +8724,6 @@
                 title: "Auth Type"
                 const: "sandbox_access_token"
                 order: 0
-                enum:
-                - "sandbox_access_token"
                 type: "string"
               advertiser_id:
                 title: "Advertiser ID"
@@ -8646,6 +8738,27 @@
             required:
             - "advertiser_id"
             - "access_token"
+        start_date:
+          title: "Start Date *"
+          description: "The Start Date in format: YYYY-MM-DD. Any data before this\
+            \ date will not be replicated. If this parameter is not set, all data\
+            \ will be replicated."
+          default: "2016-09-01"
+          pattern: "^[0-9]{4}-[0-9]{2}-[0-9]{2}$"
+          order: 1
+          type: "string"
+        report_granularity:
+          title: "Report Granularity *"
+          description: "Which time granularity should be grouped by; for LIFETIME\
+            \ there will be no grouping. This option is used for reports' streams\
+            \ only."
+          default: "DAY"
+          enum:
+          - "LIFETIME"
+          - "DAY"
+          - "HOUR"
+          order: 2
+          type: "string"
     supportsIncremental: true
     supportsNormalization: false
     supportsDBT: false
@@ -9219,7 +9332,7 @@
               path_in_connector_config:
               - "credentials"
               - "client_secret"
-- dockerImage: "airbyte/source-zendesk-support:0.2.6"
+- dockerImage: "airbyte/source-zendesk-support:0.2.7"
   spec:
     documentationUrl: "https://docs.airbyte.io/integrations/sources/zendesk-support"
     connectionSpecification:
diff --git a/airbyte-config/init/src/test/java/io/airbyte/config/init/SpecFormatTest.java b/airbyte-config/init/src/test/java/io/airbyte/config/init/SpecFormatTest.java
new file mode 100644
index 00000000000000..74e498c8d17d56
--- /dev/null
+++ b/airbyte-config/init/src/test/java/io/airbyte/config/init/SpecFormatTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.config.init;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import io.airbyte.commons.json.JsonSchemas;
+import io.airbyte.config.ConfigSchema;
+import io.airbyte.config.StandardDestinationDefinition;
+import io.airbyte.config.StandardSourceDefinition;
+import io.airbyte.config.persistence.ConfigPersistence;
+import io.airbyte.validation.json.JsonValidationException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import lombok.extern.slf4j.Slf4j;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+@Slf4j
+public class SpecFormatTest {
+
+  @Test
+  void testOnAllExistingConfig() throws IOException, JsonValidationException {
+    final ConfigPersistence configPersistence = YamlSeedConfigPersistence.getDefault();
+
+    final List<JsonNode> sourceSpecs = configPersistence.listConfigs(
+        ConfigSchema.STANDARD_SOURCE_DEFINITION, StandardSourceDefinition.class)
+        .stream()
+        .map(standardSourceDefinition -> standardSourceDefinition.getSpec().getConnectionSpecification())
+        .toList();
+
+    final List<JsonNode> destinationSpecs = configPersistence.listConfigs(
+        ConfigSchema.STANDARD_DESTINATION_DEFINITION, StandardDestinationDefinition.class)
+        .stream()
+        .map(standardDestinationDefinition -> standardDestinationDefinition.getSpec().getConnectionSpecification())
+        .toList();
+
+    final List<JsonNode> allSpecs = new ArrayList<>();
+
+    allSpecs.addAll(sourceSpecs);
+    allSpecs.addAll(destinationSpecs);
+
+    Assertions.assertThat(allSpecs)
+        .flatMap(spec -> {
+          try {
+            JsonSchemas.traverseJsonSchema(spec, (node, path) -> {});
+            return Collections.emptyList();
+          } catch (final Exception e) {
+            log.error("failed on: " + spec.toString(), e);
+            return List.of(e);
+          }
+        })
+        .isEmpty();
+  }
+
+}
diff --git a/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/split_secrets/JsonSecretsProcessor.java b/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/split_secrets/JsonSecretsProcessor.java
index 677a3051e8f797..e132fbb022c32b 100644
--- a/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/split_secrets/JsonSecretsProcessor.java
+++ b/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/split_secrets/JsonSecretsProcessor.java
@@ -6,20 +6,18 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
+import io.airbyte.commons.json.JsonPaths;
+import io.airbyte.commons.json.JsonSchemas;
 import io.airbyte.commons.json.Jsons;
+import io.airbyte.commons.util.MoreIterators;
 import io.airbyte.validation.json.JsonSchemaValidator;
-import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Optional;
-import java.util.Queue;
 import java.util.Set;
 import lombok.Builder;
-import lombok.Value;
 
 @Builder
 public class JsonSecretsProcessor {
@@ -53,18 +51,41 @@ public class JsonSecretsProcessor {
    */
   public JsonNode prepareSecretsForOutput(final JsonNode obj, final JsonNode schema) {
     if (maskSecrets) {
+      // todo (cgardens) this is not safe. should throw.
       // if schema is an object and has a properties field
-      if (!canBeProcessed(schema)) {
+      if (!isValidJsonSchema(schema)) {
         return obj;
       }
 
-      final SecretKeys secretKeys = getAllSecretKeys(schema);
-      return maskAllSecrets(obj, secretKeys);
+      return maskAllSecrets(obj, schema);
     }
 
     return obj;
   }
 
+  /**
+   * Given a JSONSchema object and an object that conforms to that schema, obfuscate all fields in the
+   * object that are a secret.
+   *
+   * @param json - json object that conforms to the schema
+   * @param schema - jsonschema object
+   * @return json object with all secrets masked.
+   */
+  public static JsonNode maskAllSecrets(final JsonNode json, final JsonNode schema) {
+    final Set<String> pathsWithSecrets = JsonSchemas.collectJsonPathsThatMeetCondition(
+        schema,
+        node -> MoreIterators.toList(node.fields())
+            .stream()
+            .anyMatch(field -> field.getKey().equals(AIRBYTE_SECRET_FIELD)));
+
+    JsonNode copy = Jsons.clone(json);
+    for (final String path : pathsWithSecrets) {
+      copy = JsonPaths.replaceAtString(copy, path, SECRETS_MASK);
+    }
+
+    return copy;
+  }
+
   /**
    * Returns a copy of the destination object in which any secret fields (as denoted by the input
    * schema) found in the source object are added.
@@ -74,12 +95,14 @@ public JsonNode prepareSecretsForOutput(final JsonNode obj, final JsonNode schem
    *
    * @param src The object potentially containing secrets
    * @param dst The object to absorb secrets into
-   * @param schema
-   * @return
+   * @param schema Schema of objects
+   * @return dst object with secrets absorbed from src object
    */
+  // todo (cgardens) - figure out how to reused JsonSchemas and JsonPaths for this traversal as well.
   public JsonNode copySecrets(final JsonNode src, final JsonNode dst, final JsonNode schema) {
     if (copySecrets) {
-      if (!canBeProcessed(schema)) {
+      // todo (cgardens) this is not safe. should throw.
+      if (!isValidJsonSchema(schema)) {
         return dst;
       }
       Preconditions.checkArgument(dst.isObject());
@@ -141,78 +164,7 @@ static boolean isSecret(final JsonNode obj) {
     return obj.isObject() && obj.has(AIRBYTE_SECRET_FIELD) && obj.get(AIRBYTE_SECRET_FIELD).asBoolean();
   }
 
-  protected JsonNode maskAllSecrets(final JsonNode obj, final SecretKeys secretKeys) {
-    final JsonNode copiedObj = obj.deepCopy();
-    final Queue<JsonNode> toProcess = new LinkedList<>();
-    toProcess.add(copiedObj);
-
-    while (!toProcess.isEmpty()) {
-      final JsonNode currentNode = toProcess.remove();
-      for (final String key : Jsons.keys(currentNode)) {
-        if (secretKeys.fieldSecretKey.contains(key)) {
-          ((ObjectNode) currentNode).put(key, SECRETS_MASK);
-        } else if (currentNode.get(key).isObject()) {
-          toProcess.add(currentNode.get(key));
-        } else if (currentNode.get(key).isArray()) {
-          if (secretKeys.arraySecretKey.contains(key)) {
-            final ArrayNode sanitizedArrayNode = new ArrayNode(JsonNodeFactory.instance);
-            currentNode.get(key).forEach((secret) -> sanitizedArrayNode.add(SECRETS_MASK));
-            ((ObjectNode) currentNode).put(key, sanitizedArrayNode);
-          } else {
-            final ArrayNode arrayNode = (ArrayNode) currentNode.get(key);
-            arrayNode.forEach((node) -> {
-              toProcess.add(node);
-            });
-          }
-        }
-      }
-    }
-
-    return copiedObj;
-  }
-
-  @Value
-  protected class SecretKeys {
-
-    private final Set<String> fieldSecretKey;
-    private final Set<String> arraySecretKey;
-
-  }
-
-  protected SecretKeys getAllSecretKeys(final JsonNode schema) {
-    final Set<String> fieldSecretKeys = new HashSet<>();
-    final Set<String> arraySecretKeys = new HashSet<>();
-
-    final Queue<JsonNode> toProcess = new LinkedList<>();
-    toProcess.add(schema);
-
-    while (!toProcess.isEmpty()) {
-      final JsonNode currentNode = toProcess.remove();
-      for (final String key : Jsons.keys(currentNode)) {
-        if (isArrayDefinition(currentNode.get(key))) {
-          final JsonNode arrayItems = currentNode.get(key).get(ITEMS_FIELD);
-          if (arrayItems.has(AIRBYTE_SECRET_FIELD) && arrayItems.get(AIRBYTE_SECRET_FIELD).asBoolean()) {
-            arraySecretKeys.add(key);
-          } else {
-            toProcess.add(arrayItems);
-          }
-        } else if (JsonSecretsProcessor.isSecret(currentNode.get(key))) {
-          fieldSecretKeys.add(key);
-        } else if (currentNode.get(key).isObject()) {
-          toProcess.add(currentNode.get(key));
-        } else if (currentNode.get(key).isArray()) {
-          final ArrayNode arrayNode = (ArrayNode) currentNode.get(key);
-          arrayNode.forEach((node) -> {
-            toProcess.add(node);
-          });
-        }
-      }
-    }
-
-    return new SecretKeys(fieldSecretKeys, arraySecretKeys);
-  }
-
-  public static Optional<String> findJsonCombinationNode(final JsonNode node) {
+  private static Optional<String> findJsonCombinationNode(final JsonNode node) {
     for (final String combinationNode : List.of("allOf", "anyOf", "oneOf")) {
       if (node.has(combinationNode) && node.get(combinationNode).isArray()) {
         return Optional.of(combinationNode);
@@ -221,15 +173,9 @@ public static Optional<String> findJsonCombinationNode(final JsonNode node) {
     return Optional.empty();
   }
 
-  public static boolean canBeProcessed(final JsonNode schema) {
+  @SuppressWarnings("BooleanMethodIsAlwaysInverted")
+  private static boolean isValidJsonSchema(final JsonNode schema) {
     return schema.isObject() && schema.has(PROPERTIES_FIELD) && schema.get(PROPERTIES_FIELD).isObject();
   }
 
-  public static boolean isArrayDefinition(final JsonNode obj) {
-    return obj.isObject()
-        && obj.has(TYPE_FIELD)
-        && obj.get(TYPE_FIELD).asText().equals(ARRAY_TYPE_FIELD)
-        && obj.has(ITEMS_FIELD);
-  }
-
 }
diff --git a/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/split_secrets/SecretsHelpers.java b/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/split_secrets/SecretsHelpers.java
index e4a3406228ad4c..63134333fce8d0 100644
--- a/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/split_secrets/SecretsHelpers.java
+++ b/airbyte-config/persistence/src/main/java/io/airbyte/config/persistence/split_secrets/SecretsHelpers.java
@@ -9,15 +9,17 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.TextNode;
 import com.google.common.annotations.VisibleForTesting;
+import io.airbyte.commons.json.JsonPaths;
+import io.airbyte.commons.json.JsonSchemas;
 import io.airbyte.commons.json.Jsons;
+import io.airbyte.commons.util.MoreIterators;
 import io.airbyte.protocol.models.ConnectorSpecification;
-import io.airbyte.validation.json.JsonSchemaValidator;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 
 /**
@@ -163,6 +165,39 @@ public static SplitSecretConfig splitAndUpdateConfig(final Supplier<UUID> uuidSu
     return internalSplitAndUpdateConfig(uuidSupplier, workspaceId, secretReader, oldPartialConfig, newFullConfig, spec.getConnectionSpecification());
   }
 
+  /**
+   * This returns all the path to the airbyte secrets based on a schema spec. The path will be return
+   * in an ascending alphabetical order.
+   */
+  public static List<String> getSortedSecretPaths(final JsonNode spec) {
+    return JsonSchemas.collectJsonPathsThatMeetCondition(
+        spec,
+        node -> MoreIterators.toList(node.fields())
+            .stream()
+            .anyMatch(field -> field.getKey().equals(JsonSecretsProcessor.AIRBYTE_SECRET_FIELD)))
+        .stream()
+        .sorted()
+        .toList();
+  }
+
+  private static Optional<String> getExistingCoordinateIfExists(final JsonNode json) {
+    if (json != null && json.has(COORDINATE_FIELD)) {
+      return Optional.ofNullable(json.get(COORDINATE_FIELD).asText());
+    } else {
+      return Optional.empty();
+    }
+  }
+
+  private static SecretCoordinate getOrCreateCoordinate(final ReadOnlySecretPersistence secretReader,
+                                                        final UUID workspaceId,
+                                                        final Supplier<UUID> uuidSupplier,
+                                                        final JsonNode newJson,
+                                                        final JsonNode persistedJson) {
+
+    final Optional<String> existingCoordinateOptional = getExistingCoordinateIfExists(persistedJson);
+    return getCoordinate(newJson.asText(), secretReader, workspaceId, uuidSupplier, existingCoordinateOptional.orElse(null));
+  }
+
   /**
    * Internal method used to support both "split config" and "split and update config" operations.
    *
@@ -179,154 +214,41 @@ public static SplitSecretConfig splitAndUpdateConfig(final Supplier<UUID> uuidSu
    *        stored for
    * @param secretReader provides a way to determine if a secret is the same or updated at a specific
    *        location in a config
-   * @param oldPartialConfig previous partial config for this specific connector configuration
-   * @param originalFullConfig new config containing secrets that will be used to update the partial
-   *        config for this connector
+   * @param persistedPartialConfig previous partial config for this specific connector configuration
+   * @param newFullConfig new config containing secrets that will be used to update the partial config
+   *        for this connector
    * @param spec connector specification
    * @return a partial config + a map of coordinates to secret payloads
    */
-  private static SplitSecretConfig internalSplitAndUpdateConfig(final Supplier<UUID> uuidSupplier,
-                                                                final UUID workspaceId,
-                                                                final ReadOnlySecretPersistence secretReader,
-                                                                final JsonNode oldPartialConfig,
-                                                                final JsonNode originalFullConfig,
-                                                                final JsonNode spec) {
-    final var fullConfig = originalFullConfig.deepCopy();
+  @VisibleForTesting
+  static SplitSecretConfig internalSplitAndUpdateConfig(final Supplier<UUID> uuidSupplier,
+                                                        final UUID workspaceId,
+                                                        final ReadOnlySecretPersistence secretReader,
+                                                        final JsonNode persistedPartialConfig,
+                                                        final JsonNode newFullConfig,
+                                                        final JsonNode spec) {
+    var fullConfigCopy = newFullConfig.deepCopy();
     final var secretMap = new HashMap<SecretCoordinate, String>();
 
-    // provide a lambda for hiding repeated arguments to improve readability
-    final InternalSplitter splitter =
-        (final JsonNode partialConfig, final JsonNode newFullConfig, final JsonNode newFullConfigSpec) -> internalSplitAndUpdateConfig(uuidSupplier,
-            workspaceId,
-            secretReader, partialConfig, newFullConfig, newFullConfigSpec);
-
-    final var specTypeToHandle = getSpecTypeToHandle(spec);
-
-    switch (specTypeToHandle) {
-      case STRING -> {
-        if (JsonSecretsProcessor.isSecret(spec)) {
-          final var oldFullSecretCoordinate = oldPartialConfig.has(COORDINATE_FIELD) ? oldPartialConfig.get(COORDINATE_FIELD).asText() : null;
-          final var secretCoordinate = getCoordinate(fullConfig.asText(), secretReader, workspaceId, uuidSupplier, oldFullSecretCoordinate);
+    final List<String> paths = getSortedSecretPaths(spec);
 
-          final var newPartialConfig = Jsons.jsonNode(Map.of(
-              COORDINATE_FIELD, secretCoordinate.getFullCoordinate()));
-
-          final var coordinateToPayload = Map.of(
-              secretCoordinate,
-              fullConfig.asText());
-
-          return new SplitSecretConfig(newPartialConfig, coordinateToPayload);
-        }
-      }
-      case OBJECT -> {
-        final var specPropertiesObject = (ObjectNode) spec.get(JsonSecretsProcessor.PROPERTIES_FIELD);
-        final var specProperties = Jsons.keys(specPropertiesObject).stream()
-            .filter(fullConfig::has)
-            .collect(Collectors.toList());
-
-        // if the input config is specified as an object, we go through and handle each type of property
-        for (final String specProperty : specProperties) {
-          final var nextOldPartialConfig = getFieldOrEmptyNode(oldPartialConfig, specProperty);
-
-          final var nestedSplitConfig =
-              splitter.splitAndUpdateConfig(nextOldPartialConfig, fullConfig.get(specProperty), spec.get("properties").get(specProperty));
-          ((ObjectNode) fullConfig).replace(specProperty, nestedSplitConfig.getPartialConfig());
-          secretMap.putAll(nestedSplitConfig.getCoordinateToPayload());
-        }
-      }
-      case ARRAY -> {
-        for (int i = 0; i < fullConfig.size(); i++) {
-          final var partialConfigElement = getFieldOrEmptyNode(oldPartialConfig, i);
-          final var fullConfigElement = fullConfig.get(i);
-          final var splitConfig = splitter.splitAndUpdateConfig(partialConfigElement, fullConfigElement, spec.get("items"));
-          secretMap.putAll(splitConfig.getCoordinateToPayload());
-          ((ArrayNode) fullConfig).set(i, splitConfig.getPartialConfig());
-        }
-      }
-      case ONE_OF -> {
-        final var possibleSchemas = (ArrayNode) spec.get("oneOf");
-
-        for (int i = 0; i < possibleSchemas.size(); i++) {
-          final var possibleSchema = possibleSchemas.get(i);
-          final var set = new JsonSchemaValidator().validate(possibleSchema, fullConfig);
-          if (set.isEmpty()) {
-            final var splitConfig = splitter.splitAndUpdateConfig(oldPartialConfig, fullConfig, possibleSchema);
-            if (!splitConfig.getPartialConfig().equals(fullConfig)) {
-              return splitConfig;
-            }
-          }
-        }
-      }
-    }
-
-    return new SplitSecretConfig(fullConfig, secretMap);
-  }
+    for (final String path : paths) {
+      fullConfigCopy = JsonPaths.replaceAt(fullConfigCopy, path, (json, pathOfNode) -> {
+        final Optional<JsonNode> persistedNode = JsonPaths.getSingleValue(persistedPartialConfig, pathOfNode);
+        final SecretCoordinate coordinate = getOrCreateCoordinate(
+            secretReader,
+            workspaceId,
+            uuidSupplier,
+            json,
+            persistedNode.orElse(null));
 
-  /**
-   * Enum that allows us to switch on different types seen in a config / spec.
-   *
-   * Unrecognized types refers to values that cannot contain string airbyte_secret secrets such as
-   * numbers, binary fields, etc. They also may contain allOf or other mechanisms that aren't fully
-   * supported in Airbyte connector configurations.
-   */
-  private enum JsonSchemaSpecType {
-    OBJECT,
-    ARRAY,
-    STRING,
-    ONE_OF,
-    UNRECOGNIZED_TYPE
-  }
+        secretMap.put(coordinate, json.asText());
 
-  /**
-   * Determines what the spec is referring to.
-   *
-   * @param spec connector specification or a sub-node of the specification
-   * @return a type used to process a config or sub-node of a config
-   */
-  private static JsonSchemaSpecType getSpecTypeToHandle(final JsonNode spec) {
-    if (isObjectSchema(spec)) {
-      return JsonSchemaSpecType.OBJECT;
-    } else if (isArraySchema(spec)) {
-      return JsonSchemaSpecType.ARRAY;
-    } else if (isStringSchema(spec)) {
-      return JsonSchemaSpecType.STRING;
-    } else if (spec.has("oneOf") && spec.get("oneOf").isArray()) {
-      return JsonSchemaSpecType.ONE_OF;
-    } else {
-      return JsonSchemaSpecType.UNRECOGNIZED_TYPE;
+        return Jsons.jsonNode(Map.of(COORDINATE_FIELD, coordinate.getFullCoordinate()));
+      });
     }
-  }
-
-  /**
-   * Interface used to make calls to
-   * {@link SecretsHelpers#internalSplitAndUpdateConfig(Supplier, UUID, ReadOnlySecretPersistence, JsonNode, JsonNode, JsonNode)}
-   * more readable by arguments that are the same across the entire method.
-   */
-  @FunctionalInterface
-  public interface InternalSplitter {
-
-    SplitSecretConfig splitAndUpdateConfig(JsonNode oldPartialConfig, JsonNode fullConfig, JsonNode spec);
-
-  }
-
-  private static boolean isStringSchema(final JsonNode schema) {
-    return schema.has("type") && schema.get("type").asText().equals("string");
-  }
-
-  private static boolean isObjectSchema(final JsonNode schema) {
-    return schema.has("properties") && schema.get("properties").isObject();
-  }
-
-  private static boolean isArraySchema(final JsonNode schema) {
-    return schema.has("items") && schema.get("items").isObject();
-  }
-
-  private static JsonNode getFieldOrEmptyNode(final JsonNode node, final String field) {
-    return node.has(field) ? node.get(field) : Jsons.emptyObject();
-  }
 
-  private static JsonNode getFieldOrEmptyNode(final JsonNode node, final int field) {
-    return node.has(field) ? node.get(field) : Jsons.emptyObject();
+    return new SplitSecretConfig(fullConfigCopy, secretMap);
   }
 
   /**
diff --git a/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/split_secrets/JsonSecretsProcessorTest.java b/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/split_secrets/JsonSecretsProcessorTest.java
index 92b44d0ef8eee1..f0a33824b30884 100644
--- a/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/split_secrets/JsonSecretsProcessorTest.java
+++ b/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/split_secrets/JsonSecretsProcessorTest.java
@@ -24,144 +24,172 @@
 public class JsonSecretsProcessorTest {
 
   private static final JsonNode SCHEMA_ONE_LAYER = Jsons.deserialize(
-      "{\n"
-          + "  \"properties\": {\n"
-          + "    \"secret1\": {\n"
-          + "      \"type\": \"string\",\n"
-          + "      \"airbyte_secret\": true\n"
-          + "    },\n"
-          + "    \"secret2\": {\n"
-          + "      \"type\": \"string\",\n"
-          + "      \"airbyte_secret\": \"true\"\n"
-          + "    },\n"
-          + "    \"field1\": {\n"
-          + "      \"type\": \"string\"\n"
-          + "    },\n"
-          + "    \"field2\": {\n"
-          + "      \"type\": \"number\"\n"
-          + "    }\n"
-          + "  }\n"
-          + "}\n");
+      """
+      {
+        "type": "object",  "properties": {
+          "secret1": {
+            "type": "string",
+            "airbyte_secret": true
+          },
+          "secret2": {
+            "type": "string",
+            "airbyte_secret": "true"
+          },
+          "field1": {
+            "type": "string"
+          },
+          "field2": {
+            "type": "number"
+          }
+        }
+      }
+      """);
+
+  private static final JsonNode SCHEMA_WITH_ARRAY = Jsons.deserialize(
+      """
+      {
+        "type": "object",  "properties": {
+          "secret1": {
+            "type": "array",      "items": {
+              "type": "string",
+              "airbyte_secret": true
+            }
+          },
+          "secret2": {
+            "type": "string",
+            "airbyte_secret": "true"
+          },
+          "field1": {
+            "type": "string"
+          },
+          "field2": {
+            "type": "number"
+          }
+        }
+      }
+      """);
 
   private static final JsonNode SCHEMA_INNER_OBJECT = Jsons.deserialize(
-      "{\n"
-          + "    \"type\": \"object\",\n"
-          + "    \"properties\": {\n"
-          + "      \"warehouse\": {\n"
-          + "        \"type\": \"string\"\n"
-          + "      },\n"
-          + "      \"loading_method\": {\n"
-          + "        \"type\": \"object\",\n"
-          + "        \"oneOf\": [\n"
-          + "          {\n"
-          + "            \"properties\": {}\n"
-          + "          },\n"
-          + "          {\n"
-          + "            \"properties\": {\n"
-          + "              \"s3_bucket_name\": {\n"
-          + "                \"type\": \"string\"\n"
-          + "              },\n"
-          + "              \"secret_access_key\": {\n"
-          + "                \"type\": \"string\",\n"
-          + "                \"airbyte_secret\": true\n"
-          + "              }\n"
-          + "            }\n"
-          + "          }\n"
-          + "        ]\n"
-          + "      }\n"
-          + "    }\n"
-          + "  }");
+      """
+      {
+          "type": "object",
+          "properties": {
+            "warehouse": {
+              "type": "string"
+            },
+            "loading_method": {
+              "type": "object",
+              "oneOf": [
+                {
+                  "properties": {}
+                },
+                {
+                  "properties": {
+                    "s3_bucket_name": {
+                      "type": "string"
+                    },
+                    "secret_access_key": {
+                      "type": "string",
+                      "airbyte_secret": true
+                    }
+                  }
+                }
+              ]
+            }
+          }
+        }""");
 
   private static final JsonNode ONE_OF_WITH_SAME_KEY_IN_SUB_SCHEMAS = Jsons.deserialize(
-      "{\n"
-          + "    \"$schema\": \"http://json-schema.org/draft-07/schema#\",\n"
-          + "    \"title\": \"S3 Destination Spec\",\n"
-          + "    \"type\": \"object\",\n"
-          + "    \"required\": [\n"
-          + "      \"client_id\",\n"
-          + "      \"format\"\n"
-          + "    ],\n"
-          + "    \"additionalProperties\": false,\n"
-          + "    \"properties\": {\n"
-          + "      \"client_id\": {\n"
-          + "        \"title\": \"client it\",\n"
-          + "        \"type\": \"string\",\n"
-          + "        \"default\": \"\"\n"
-          + "      },\n"
-          + "      \"format\": {\n"
-          + "        \"title\": \"Output Format\",\n"
-          + "        \"type\": \"object\",\n"
-          + "        \"description\": \"Output data format\",\n"
-          + "        \"oneOf\": [\n"
-          + "          {\n"
-          + "            \"title\": \"Avro: Apache Avro\",\n"
-          + "            \"required\": [\"format_type\", \"compression_codec\"],\n"
-          + "            \"properties\": {\n"
-          + "              \"format_type\": {\n"
-          + "                \"type\": \"string\",\n"
-          + "                \"enum\": [\"Avro\"],\n"
-          + "                \"default\": \"Avro\"\n"
-          + "              },\n"
-          + "              \"compression_codec\": {\n"
-          + "                \"title\": \"Compression Codec\",\n"
-          + "                \"description\": \"The compression algorithm used to compress data. Default to no compression.\",\n"
-          + "                \"type\": \"object\",\n"
-          + "                \"oneOf\": [\n"
-          + "                  {\n"
-          + "                    \"title\": \"no compression\",\n"
-          + "                    \"required\": [\"codec\"],\n"
-          + "                    \"properties\": {\n"
-          + "                      \"codec\": {\n"
-          + "                        \"type\": \"string\",\n"
-          + "                        \"enum\": [\"no compression\"],\n"
-          + "                        \"default\": \"no compression\"\n"
-          + "                      }\n"
-          + "                    }\n"
-          + "                  },\n"
-          + "                  {\n"
-          + "                    \"title\": \"Deflate\",\n"
-          + "                    \"required\": [\"codec\", \"compression_level\"],\n"
-          + "                    \"properties\": {\n"
-          + "                      \"codec\": {\n"
-          + "                        \"type\": \"string\",\n"
-          + "                        \"enum\": [\"Deflate\"],\n"
-          + "                        \"default\": \"Deflate\"\n"
-          + "                      },\n"
-          + "                      \"compression_level\": {\n"
-          + "                        \"type\": \"integer\",\n"
-          + "                        \"default\": 0,\n"
-          + "                        \"minimum\": 0,\n"
-          + "                        \"maximum\": 9\n"
-          + "                      }\n"
-          + "                    }\n"
-          + "                  }\n"
-          + "                ]\n"
-          + "              }\n"
-          + "            }\n"
-          + "          },\n"
-          + "          {\n"
-          + "            \"title\": \"Parquet: Columnar Storage\",\n"
-          + "            \"required\": [\"format_type\"],\n"
-          + "            \"properties\": {\n"
-          + "              \"format_type\": {\n"
-          + "                \"type\": \"string\",\n"
-          + "                \"enum\": [\"Parquet\"],\n"
-          + "                \"default\": \"Parquet\"\n"
-          + "              },\n"
-          + "              \"compression_codec\": {\n"
-          + "                \"type\": \"string\",\n"
-          + "                \"enum\": [\n"
-          + "                  \"UNCOMPRESSED\",\n"
-          + "                  \"GZIP\"\n"
-          + "                ],\n"
-          + "                \"default\": \"UNCOMPRESSED\"\n"
-          + "              }\n"
-          + "            }\n"
-          + "          }\n"
-          + "        ]\n"
-          + "      }\n"
-          + "    }\n"
-          + "  }");
+      """
+      {
+          "$schema": "http://json-schema.org/draft-07/schema#",
+          "title": "S3 Destination Spec",
+          "type": "object",
+          "required": [
+            "client_id",
+            "format"
+          ],
+          "additionalProperties": false,
+          "properties": {
+            "client_id": {
+              "title": "client it",
+              "type": "string",
+              "default": ""
+            },
+            "format": {
+              "title": "Output Format",
+              "type": "object",
+              "description": "Output data format",
+              "oneOf": [
+                {
+                  "title": "Avro: Apache Avro",
+                  "required": ["format_type", "compression_codec"],
+                  "properties": {
+                    "format_type": {
+                      "type": "string",
+                      "enum": ["Avro"],
+                      "default": "Avro"
+                    },
+                    "compression_codec": {
+                      "title": "Compression Codec",
+                      "description": "The compression algorithm used to compress data. Default to no compression.",
+                      "type": "object",
+                      "oneOf": [
+                        {
+                          "title": "no compression",
+                          "required": ["codec"],
+                          "properties": {
+                            "codec": {
+                              "type": "string",
+                              "enum": ["no compression"],
+                              "default": "no compression"
+                            }
+                          }
+                        },
+                        {
+                          "title": "Deflate",
+                          "required": ["codec", "compression_level"],
+                          "properties": {
+                            "codec": {
+                              "type": "string",
+                              "enum": ["Deflate"],
+                              "default": "Deflate"
+                            },
+                            "compression_level": {
+                              "type": "integer",
+                              "default": 0,
+                              "minimum": 0,
+                              "maximum": 9
+                            }
+                          }
+                        }
+                      ]
+                    }
+                  }
+                },
+                {
+                  "title": "Parquet: Columnar Storage",
+                  "required": ["format_type"],
+                  "properties": {
+                    "format_type": {
+                      "type": "string",
+                      "enum": ["Parquet"],
+                      "default": "Parquet"
+                    },
+                    "compression_codec": {
+                      "type": "string",
+                      "enum": [
+                        "UNCOMPRESSED",
+                        "GZIP"
+                      ],
+                      "default": "UNCOMPRESSED"
+                    }
+                  }
+                }
+              ]
+            }
+          }
+        }""");
 
   private JsonSecretsProcessor processor;
 
@@ -311,7 +339,8 @@ private static Stream<Arguments> scenarioProvider() {
         Arguments.of("postgres_ssh_key", true),
         Arguments.of("postgres_ssh_key", false),
         Arguments.of("simple", true),
-        Arguments.of("simple", false));
+        Arguments.of("simple", false),
+        Arguments.of("enum", false));
   }
 
   @ParameterizedTest
@@ -331,10 +360,38 @@ void testSecretScenario(final String folder, final boolean partial) throws IOExc
     final JsonNode expected = objectMapper.readTree(expectedIs);
 
     final JsonNode actual = processor.prepareSecretsForOutput(input, specs);
-
     assertEquals(expected, actual);
   }
 
+  // todo (cgardens) - example of a case that is not properly handled. we should explicitly call out
+  // that this type of jsonschema object is not allowed to do secrets.
+  // private static Stream<Arguments> scenarioProvider2() {
+  // return Stream.of(
+  // Arguments.of("array2", true),
+  // Arguments.of("array2", false));
+  // }
+  //
+  // @ParameterizedTest
+  // @MethodSource("scenarioProvider2")
+  // void testSecretScenario2(final String folder, final boolean partial) throws IOException {
+  // final ObjectMapper objectMapper = new ObjectMapper();
+  //
+  // final InputStream specIs = getClass().getClassLoader().getResourceAsStream(folder +
+  // "/spec.json");
+  // final JsonNode specs = objectMapper.readTree(specIs);
+  //
+  // final String inputFilePath = folder + (partial ? "/partial_config.json" : "/full_config.json");
+  // final InputStream inputIs = getClass().getClassLoader().getResourceAsStream(inputFilePath);
+  // final JsonNode input = objectMapper.readTree(inputIs);
+  //
+  // final String expectedFilePath = folder + "/expected.json";
+  // final InputStream expectedIs = getClass().getClassLoader().getResourceAsStream(expectedFilePath);
+  // final JsonNode expected = objectMapper.readTree(expectedIs);
+  //
+  // final JsonNode actual = Secrets.maskAllSecrets(input, specs);
+  // assertEquals(expected, actual);
+  // }
+
   @Test
   public void copiesSecrets_inNestedNonCombinationNode() throws JsonProcessingException {
     final ObjectMapper objectMapper = new ObjectMapper();
diff --git a/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/split_secrets/SecretsHelpersTest.java b/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/split_secrets/SecretsHelpersTest.java
index a1a8fe14735b9d..87b92efe46432f 100644
--- a/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/split_secrets/SecretsHelpersTest.java
+++ b/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/split_secrets/SecretsHelpersTest.java
@@ -4,8 +4,12 @@
 
 package io.airbyte.config.persistence.split_secrets;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import io.airbyte.config.persistence.split_secrets.test_cases.ArrayOneOfTestCase;
 import io.airbyte.config.persistence.split_secrets.test_cases.ArrayTestCase;
 import io.airbyte.config.persistence.split_secrets.test_cases.NestedObjectTestCase;
@@ -16,11 +20,13 @@
 import io.airbyte.config.persistence.split_secrets.test_cases.SimpleTestCase;
 import io.airbyte.validation.json.JsonSchemaValidator;
 import io.airbyte.validation.json.JsonValidationException;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -204,4 +210,14 @@ void testUpdatingSecretsOneAtATime() {
     assertEquals(testCase.getSecretMapAfterUpdate2(), updatedSplit2.getCoordinateToPayload());
   }
 
+  @ParameterizedTest
+  @MethodSource("provideTestCases")
+  void testSecretPath(final SecretsTestCase testCase) throws IOException {
+    final JsonNode spec = testCase.getSpec().getConnectionSpecification();
+
+    final List<String> secretsPaths = SecretsHelpers.getSortedSecretPaths(spec);
+
+    Assertions.assertThat(secretsPaths).containsExactlyElementsOf(testCase.getExpectedSecretsPaths());
+  }
+
 }
diff --git a/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/split_secrets/SecretsTestCase.java b/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/split_secrets/SecretsTestCase.java
index 3244a3c2d032a0..33004273376a05 100644
--- a/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/split_secrets/SecretsTestCase.java
+++ b/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/split_secrets/SecretsTestCase.java
@@ -10,6 +10,8 @@
 import io.airbyte.commons.resources.MoreResources;
 import io.airbyte.protocol.models.ConnectorSpecification;
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
 
@@ -39,6 +41,10 @@ default JsonNode getPartialConfig() {
     return Exceptions.toRuntime(() -> getNodeResource(getName(), "partial_config.json"));
   }
 
+  default JsonNode getSortedPartialConfig() {
+    return Exceptions.toRuntime(() -> getNodeResource(getName(), "partial_config.json"));
+  }
+
   default JsonNode getUpdateConfig() {
     return Exceptions.toRuntime(() -> getNodeResource(getName(), "update_config.json"));
   }
@@ -51,4 +57,13 @@ default JsonNode getNodeResource(final String testCase, final String fileName) t
     return Jsons.deserialize(MoreResources.readResource(testCase + "/" + fileName));
   }
 
+  default List<String> getExpectedSecretsPaths() throws IOException {
+    return Arrays.stream(
+        MoreResources.readResource(getName() + "/" + "expectedPaths")
+            .trim()
+            .split(";"))
+        .sorted()
+        .toList();
+  }
+
 }
diff --git a/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/split_secrets/test_cases/ArrayTestCase.java b/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/split_secrets/test_cases/ArrayTestCase.java
index 0c27191985fc3a..af4d87ac581324 100644
--- a/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/split_secrets/test_cases/ArrayTestCase.java
+++ b/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/split_secrets/test_cases/ArrayTestCase.java
@@ -32,12 +32,12 @@ public Map<SecretCoordinate, String> getFirstSecretMap() {
   @Override
   public Map<SecretCoordinate, String> getSecondSecretMap() {
     return Map.of(
-        new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(0), 2), "key5",
-        new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(1), 2), "key6",
-        new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(2), 2), "key7",
-        new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(3), 2), "key8",
-        new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(4), 2), "key9",
-        new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(5), 2), "key10");
+        new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(0), 2), "key8",
+        new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(1), 2), "key9",
+        new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(2), 2), "key10",
+        new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(3), 2), "key5",
+        new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(4), 2), "key6",
+        new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(5), 2), "key7");
   }
 
   @Override
diff --git a/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/split_secrets/test_cases/NestedObjectTestCase.java b/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/split_secrets/test_cases/NestedObjectTestCase.java
index 9cc4782790cd92..f111ea4a271bc5 100644
--- a/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/split_secrets/test_cases/NestedObjectTestCase.java
+++ b/airbyte-config/persistence/src/test/java/io/airbyte/config/persistence/split_secrets/test_cases/NestedObjectTestCase.java
@@ -23,25 +23,25 @@ public String getName() {
   @Override
   public Map<SecretCoordinate, String> getFirstSecretMap() {
     return Map.of(
-        new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(0), 1), "hunter1",
-        new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(1), 1), "hunter2");
+        new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(1), 1), "hunter1",
+        new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(0), 1), "hunter2");
   }
 
   @Override
   public Map<SecretCoordinate, String> getSecondSecretMap() {
     return Map.of(
-        new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(0), 2), "hunter3",
-        new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(1), 2), "hunter4");
+        new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(1), 2), "hunter3",
+        new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(0), 2), "hunter4");
   }
 
   @Override
   public Consumer<SecretPersistence> getPersistenceUpdater() {
     return secretPersistence -> {
       secretPersistence.write(
-          new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(0), 1),
+          new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(1), 1),
           "hunter1");
       secretPersistence.write(
-          new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(1), 1),
+          new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(0), 1),
           "hunter2");
     };
   }
@@ -67,14 +67,14 @@ public JsonNode getFullConfigUpdate2() {
 
   public Map<SecretCoordinate, String> getSecretMapAfterUpdate1() {
     return Map.of(
-        new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(0), 2), "hunter3",
-        new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(1), 1), "hunter2");
+        new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(1), 2), "hunter3",
+        new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(0), 1), "hunter2");
   }
 
   public Map<SecretCoordinate, String> getSecretMapAfterUpdate2() {
     return Map.of(
-        new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(0), 2), "hunter3",
-        new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(1), 2), "hunter4");
+        new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(1), 2), "hunter3",
+        new SecretCoordinate("airbyte_workspace_" + SecretsHelpersTest.WORKSPACE_ID + "_secret_" + SecretsHelpersTest.UUIDS.get(0), 2), "hunter4");
   }
 
 }
diff --git a/airbyte-config/persistence/src/test/resources/array/expectedPaths b/airbyte-config/persistence/src/test/resources/array/expectedPaths
new file mode 100644
index 00000000000000..61c3501c4f3f36
--- /dev/null
+++ b/airbyte-config/persistence/src/test/resources/array/expectedPaths
@@ -0,0 +1 @@
+$.rotating_key_strings[*];$.rotating_key_objects[*].a
diff --git a/airbyte-config/persistence/src/test/resources/array/partial_config.json b/airbyte-config/persistence/src/test/resources/array/partial_config.json
index 516b030fa2a31e..e7a6dd7909bb1c 100644
--- a/airbyte-config/persistence/src/test/resources/array/partial_config.json
+++ b/airbyte-config/persistence/src/test/resources/array/partial_config.json
@@ -2,29 +2,29 @@
   "username": "charles",
   "rotating_key_strings": [
     {
-      "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_9eba44d8-51e7-48f1-bde2-619af0e42c22_v1"
+      "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_c03ef566-79a7-4e77-b6f3-d23d2528f25a_v1"
     },
     {
-      "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_2c2ef2b3-259a-4e73-96d1-f56dacee2e5e_v1"
+      "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_35f08b15-bfd9-44fe-a8c7-5aa9e156c0f5_v1"
     },
     {
-      "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_1206db5b-b968-4df1-9a76-f3fcdae7e307_v1"
+      "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_159c0b6f-f9ae-48b4-b7f3-bcac4ba15743_v1"
     }
   ],
   "rotating_key_objects": [
     {
       "a": {
-        "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_c03ef566-79a7-4e77-b6f3-d23d2528f25a_v1"
+        "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_9eba44d8-51e7-48f1-bde2-619af0e42c22_v1"
       }
     },
     {
       "a": {
-        "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_35f08b15-bfd9-44fe-a8c7-5aa9e156c0f5_v1"
+        "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_2c2ef2b3-259a-4e73-96d1-f56dacee2e5e_v1"
       }
     },
     {
       "a": {
-        "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_159c0b6f-f9ae-48b4-b7f3-bcac4ba15743_v1"
+        "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_1206db5b-b968-4df1-9a76-f3fcdae7e307_v1"
       }
     }
   ]
diff --git a/airbyte-config/persistence/src/test/resources/array/updated_partial_config.json b/airbyte-config/persistence/src/test/resources/array/updated_partial_config.json
index b1ff8557d9ef0a..672a7de1bd2cbe 100644
--- a/airbyte-config/persistence/src/test/resources/array/updated_partial_config.json
+++ b/airbyte-config/persistence/src/test/resources/array/updated_partial_config.json
@@ -2,29 +2,29 @@
   "username": "charles",
   "rotating_key_strings": [
     {
-      "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_9eba44d8-51e7-48f1-bde2-619af0e42c22_v2"
+      "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_c03ef566-79a7-4e77-b6f3-d23d2528f25a_v2"
     },
     {
-      "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_2c2ef2b3-259a-4e73-96d1-f56dacee2e5e_v2"
+      "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_35f08b15-bfd9-44fe-a8c7-5aa9e156c0f5_v2"
     },
     {
-      "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_1206db5b-b968-4df1-9a76-f3fcdae7e307_v2"
+      "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_159c0b6f-f9ae-48b4-b7f3-bcac4ba15743_v2"
     }
   ],
   "rotating_key_objects": [
     {
       "a": {
-        "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_c03ef566-79a7-4e77-b6f3-d23d2528f25a_v2"
+        "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_9eba44d8-51e7-48f1-bde2-619af0e42c22_v2"
       }
     },
     {
       "a": {
-        "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_35f08b15-bfd9-44fe-a8c7-5aa9e156c0f5_v2"
+        "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_2c2ef2b3-259a-4e73-96d1-f56dacee2e5e_v2"
       }
     },
     {
       "a": {
-        "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_159c0b6f-f9ae-48b4-b7f3-bcac4ba15743_v2"
+        "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_1206db5b-b968-4df1-9a76-f3fcdae7e307_v2"
       }
     }
   ]
diff --git a/airbyte-config/persistence/src/test/resources/array2/expected.json b/airbyte-config/persistence/src/test/resources/array2/expected.json
new file mode 100644
index 00000000000000..abaa3e233eef69
--- /dev/null
+++ b/airbyte-config/persistence/src/test/resources/array2/expected.json
@@ -0,0 +1,3 @@
+{
+  "cred": ["**********"]
+}
diff --git a/airbyte-config/persistence/src/test/resources/array2/full_config.json b/airbyte-config/persistence/src/test/resources/array2/full_config.json
new file mode 100644
index 00000000000000..7edbb656fb36f6
--- /dev/null
+++ b/airbyte-config/persistence/src/test/resources/array2/full_config.json
@@ -0,0 +1,3 @@
+{
+  "cred": ["hunter2"]
+}
diff --git a/airbyte-config/persistence/src/test/resources/array2/partial_config.json b/airbyte-config/persistence/src/test/resources/array2/partial_config.json
new file mode 100644
index 00000000000000..7ba03d02f4e526
--- /dev/null
+++ b/airbyte-config/persistence/src/test/resources/array2/partial_config.json
@@ -0,0 +1,7 @@
+{
+  "cred": [
+    {
+      "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_159c0b6f-f9ae-48b4-b7f3-bcac4ba15743_v1"
+    }
+  ]
+}
diff --git a/airbyte-config/persistence/src/test/resources/array2/spec.json b/airbyte-config/persistence/src/test/resources/array2/spec.json
new file mode 100644
index 00000000000000..05c3bbea3900e9
--- /dev/null
+++ b/airbyte-config/persistence/src/test/resources/array2/spec.json
@@ -0,0 +1,20 @@
+{
+  "type": "object",
+  "properties": {
+    "cred": {
+      "oneOf": [
+        {
+          "type": "string",
+          "airbyte_secret": true
+        },
+        {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "airbyte_secret": true
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/airbyte-config/persistence/src/test/resources/array2/update_config.json b/airbyte-config/persistence/src/test/resources/array2/update_config.json
new file mode 100644
index 00000000000000..e8270b1653cfd3
--- /dev/null
+++ b/airbyte-config/persistence/src/test/resources/array2/update_config.json
@@ -0,0 +1,3 @@
+{
+  "cred": ["hunter20"]
+}
diff --git a/airbyte-config/persistence/src/test/resources/array2/updated_partial_config.json b/airbyte-config/persistence/src/test/resources/array2/updated_partial_config.json
new file mode 100644
index 00000000000000..aab04a199c11c7
--- /dev/null
+++ b/airbyte-config/persistence/src/test/resources/array2/updated_partial_config.json
@@ -0,0 +1,7 @@
+{
+  "cred": [
+    {
+      "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_159c0b6f-f9ae-48b4-b7f3-bcac4ba15743_v2"
+    }
+  ]
+}
diff --git a/airbyte-config/persistence/src/test/resources/array_of_oneof/expectedPaths b/airbyte-config/persistence/src/test/resources/array_of_oneof/expectedPaths
new file mode 100644
index 00000000000000..29b1c466d2d64c
--- /dev/null
+++ b/airbyte-config/persistence/src/test/resources/array_of_oneof/expectedPaths
@@ -0,0 +1 @@
+$.rotating_keys[*].key1;$.rotating_keys[*].key2
diff --git a/airbyte-config/persistence/src/test/resources/enum/expected.json b/airbyte-config/persistence/src/test/resources/enum/expected.json
new file mode 100644
index 00000000000000..46f6281497d6a2
--- /dev/null
+++ b/airbyte-config/persistence/src/test/resources/enum/expected.json
@@ -0,0 +1,7 @@
+{
+  "account_id": "1234567891234567",
+  "start_date": "2022-04-01T00:00:00Z",
+  "access_token": "**********",
+  "include_deleted": false,
+  "fetch_thumbnail_images": false
+}
diff --git a/airbyte-config/persistence/src/test/resources/enum/full_config.json b/airbyte-config/persistence/src/test/resources/enum/full_config.json
new file mode 100644
index 00000000000000..da1a8ba13e1d34
--- /dev/null
+++ b/airbyte-config/persistence/src/test/resources/enum/full_config.json
@@ -0,0 +1,9 @@
+{
+  "account_id": "1234567891234567",
+  "start_date": "2022-04-01T00:00:00Z",
+  "access_token": {
+    "_secret": "it-s-hidden"
+  },
+  "include_deleted": false,
+  "fetch_thumbnail_images": false
+}
diff --git a/airbyte-config/persistence/src/test/resources/enum/spec.json b/airbyte-config/persistence/src/test/resources/enum/spec.json
new file mode 100644
index 00000000000000..5b927b33e3cfa1
--- /dev/null
+++ b/airbyte-config/persistence/src/test/resources/enum/spec.json
@@ -0,0 +1,296 @@
+{
+  "type": "object",
+  "title": "Source Facebook Marketing",
+  "required": ["account_id", "start_date", "access_token"],
+  "properties": {
+    "end_date": {
+      "type": "string",
+      "order": 2,
+      "title": "End Date",
+      "format": "date-time",
+      "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$",
+      "examples": ["2017-01-26T00:00:00Z"],
+      "description": "The date until which you'd like to replicate data for all incremental streams, in the format YYYY-MM-DDT00:00:00Z. All data generated between start_date and this date will be replicated. Not setting this option will result in always syncing the latest data."
+    },
+    "account_id": {
+      "type": "string",
+      "order": 0,
+      "title": "Account ID",
+      "examples": ["111111111111111"],
+      "description": "The Facebook Ad account ID to use when pulling data from the Facebook Marketing API."
+    },
+    "start_date": {
+      "type": "string",
+      "order": 1,
+      "title": "Start Date",
+      "format": "date-time",
+      "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$",
+      "examples": ["2017-01-25T00:00:00Z"],
+      "description": "The date from which you'd like to replicate data for all incremental streams, in the format YYYY-MM-DDT00:00:00Z. All data generated after this date will be replicated."
+    },
+    "access_token": {
+      "type": "string",
+      "order": 3,
+      "title": "Access Token",
+      "description": "The value of the access token generated. See the <a href=\"https://docs.airbyte.io/integrations/sources/facebook-marketing\">docs</a> for more information",
+      "airbyte_secret": true
+    },
+    "custom_insights": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "title": "InsightConfig",
+        "required": ["name"],
+        "properties": {
+          "name": {
+            "type": "string",
+            "title": "Name",
+            "description": "The name value of insight"
+          },
+          "fields": {
+            "type": "array",
+            "items": {
+              "enum": [
+                "account_currency",
+                "account_id",
+                "account_name",
+                "action_values",
+                "actions",
+                "ad_bid_value",
+                "ad_click_actions",
+                "ad_id",
+                "ad_impression_actions",
+                "ad_name",
+                "adset_bid_value",
+                "adset_end",
+                "adset_id",
+                "adset_name",
+                "adset_start",
+                "age_targeting",
+                "attribution_setting",
+                "auction_bid",
+                "auction_competitiveness",
+                "auction_max_competitor_bid",
+                "buying_type",
+                "campaign_id",
+                "campaign_name",
+                "canvas_avg_view_percent",
+                "canvas_avg_view_time",
+                "catalog_segment_actions",
+                "catalog_segment_value",
+                "catalog_segment_value_mobile_purchase_roas",
+                "catalog_segment_value_omni_purchase_roas",
+                "catalog_segment_value_website_purchase_roas",
+                "clicks",
+                "conversion_rate_ranking",
+                "conversion_values",
+                "conversions",
+                "converted_product_quantity",
+                "converted_product_value",
+                "cost_per_15_sec_video_view",
+                "cost_per_2_sec_continuous_video_view",
+                "cost_per_action_type",
+                "cost_per_ad_click",
+                "cost_per_conversion",
+                "cost_per_dda_countby_convs",
+                "cost_per_estimated_ad_recallers",
+                "cost_per_inline_link_click",
+                "cost_per_inline_post_engagement",
+                "cost_per_one_thousand_ad_impression",
+                "cost_per_outbound_click",
+                "cost_per_thruplay",
+                "cost_per_unique_action_type",
+                "cost_per_unique_click",
+                "cost_per_unique_conversion",
+                "cost_per_unique_inline_link_click",
+                "cost_per_unique_outbound_click",
+                "cpc",
+                "cpm",
+                "cpp",
+                "created_time",
+                "ctr",
+                "date_start",
+                "date_stop",
+                "dda_countby_convs",
+                "dda_results",
+                "engagement_rate_ranking",
+                "estimated_ad_recall_rate",
+                "estimated_ad_recall_rate_lower_bound",
+                "estimated_ad_recall_rate_upper_bound",
+                "estimated_ad_recallers",
+                "estimated_ad_recallers_lower_bound",
+                "estimated_ad_recallers_upper_bound",
+                "frequency",
+                "full_view_impressions",
+                "full_view_reach",
+                "gender_targeting",
+                "impressions",
+                "inline_link_click_ctr",
+                "inline_link_clicks",
+                "inline_post_engagement",
+                "instant_experience_clicks_to_open",
+                "instant_experience_clicks_to_start",
+                "instant_experience_outbound_clicks",
+                "interactive_component_tap",
+                "labels",
+                "location",
+                "mobile_app_purchase_roas",
+                "objective",
+                "optimization_goal",
+                "outbound_clicks",
+                "outbound_clicks_ctr",
+                "place_page_name",
+                "purchase_roas",
+                "qualifying_question_qualify_answer_rate",
+                "quality_ranking",
+                "quality_score_ectr",
+                "quality_score_ecvr",
+                "quality_score_organic",
+                "reach",
+                "social_spend",
+                "spend",
+                "total_postbacks",
+                "unique_actions",
+                "unique_clicks",
+                "unique_conversions",
+                "unique_ctr",
+                "unique_inline_link_click_ctr",
+                "unique_inline_link_clicks",
+                "unique_link_clicks_ctr",
+                "unique_outbound_clicks",
+                "unique_outbound_clicks_ctr",
+                "unique_video_continuous_2_sec_watched_actions",
+                "unique_video_view_15_sec",
+                "updated_time",
+                "video_15_sec_watched_actions",
+                "video_30_sec_watched_actions",
+                "video_avg_time_watched_actions",
+                "video_continuous_2_sec_watched_actions",
+                "video_p100_watched_actions",
+                "video_p25_watched_actions",
+                "video_p50_watched_actions",
+                "video_p75_watched_actions",
+                "video_p95_watched_actions",
+                "video_play_actions",
+                "video_play_curve_actions",
+                "video_play_retention_0_to_15s_actions",
+                "video_play_retention_20_to_60s_actions",
+                "video_play_retention_graph_actions",
+                "video_thruplay_watched_actions",
+                "video_time_watched_actions",
+                "website_ctr",
+                "website_purchase_roas",
+                "wish_bid"
+              ],
+              "title": "ValidEnums",
+              "description": "Generic enumeration.\n\nDerive from this class to define new enumerations."
+            },
+            "title": "Fields",
+            "default": [],
+            "description": "A list of chosen fields for fields parameter"
+          },
+          "end_date": {
+            "type": "string",
+            "title": "End Date",
+            "format": "date-time",
+            "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$",
+            "examples": ["2017-01-26T00:00:00Z"],
+            "description": "The date until which you'd like to replicate data for this stream, in the format YYYY-MM-DDT00:00:00Z. All data generated between the start date and this date will be replicated. Not setting this option will result in always syncing the latest data."
+          },
+          "breakdowns": {
+            "type": "array",
+            "items": {
+              "enum": [
+                "ad_format_asset",
+                "age",
+                "app_id",
+                "body_asset",
+                "call_to_action_asset",
+                "country",
+                "description_asset",
+                "device_platform",
+                "dma",
+                "frequency_value",
+                "gender",
+                "hourly_stats_aggregated_by_advertiser_time_zone",
+                "hourly_stats_aggregated_by_audience_time_zone",
+                "image_asset",
+                "impression_device",
+                "link_url_asset",
+                "place_page_id",
+                "platform_position",
+                "product_id",
+                "publisher_platform",
+                "region",
+                "skan_conversion_id",
+                "title_asset",
+                "video_asset"
+              ],
+              "title": "ValidBreakdowns",
+              "description": "Generic enumeration.\n\nDerive from this class to define new enumerations."
+            },
+            "title": "Breakdowns",
+            "default": [],
+            "description": "A list of chosen breakdowns for breakdowns"
+          },
+          "start_date": {
+            "type": "string",
+            "title": "Start Date",
+            "format": "date-time",
+            "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$",
+            "examples": ["2017-01-25T00:00:00Z"],
+            "description": "The date from which you'd like to replicate data for this stream, in the format YYYY-MM-DDT00:00:00Z."
+          },
+          "time_increment": {
+            "type": "integer",
+            "title": "Time Increment",
+            "default": 1,
+            "description": "Time window in days by which to aggregate statistics. The sync will be chunked into N day intervals, where N is the number of days you specified. For example, if you set this value to 7, then all statistics will be reported as 7-day aggregates by starting from the start_date. If the start and end dates are October 1st and October 30th, then the connector will output 5 records: 01 - 06, 07 - 13, 14 - 20, 21 - 27, and 28 - 30 (3 days only).",
+            "exclusiveMaximum": 90,
+            "exclusiveMinimum": 0
+          },
+          "action_breakdowns": {
+            "type": "array",
+            "items": {
+              "enum": [
+                "action_canvas_component_name",
+                "action_carousel_card_id",
+                "action_carousel_card_name",
+                "action_destination",
+                "action_device",
+                "action_reaction",
+                "action_target_id",
+                "action_type",
+                "action_video_sound",
+                "action_video_type"
+              ],
+              "title": "ValidActionBreakdowns",
+              "description": "Generic enumeration.\n\nDerive from this class to define new enumerations."
+            },
+            "title": "Action Breakdowns",
+            "default": [],
+            "description": "A list of chosen action_breakdowns for action_breakdowns"
+          }
+        },
+        "description": "Config for custom insights"
+      },
+      "order": 6,
+      "title": "Custom Insights",
+      "description": "A list which contains insights entries, each entry must have a name and can contains fields, breakdowns or action_breakdowns)"
+    },
+    "include_deleted": {
+      "type": "boolean",
+      "order": 4,
+      "title": "Include Deleted",
+      "default": false,
+      "description": "Include data from deleted Campaigns, Ads, and AdSets"
+    },
+    "fetch_thumbnail_images": {
+      "type": "boolean",
+      "order": 5,
+      "title": "Fetch Thumbnail Images",
+      "default": false,
+      "description": "In each Ad Creative, fetch the thumbnail_url and store the result in thumbnail_data_url"
+    }
+  }
+}
diff --git a/airbyte-config/persistence/src/test/resources/nested_object/expectedPaths b/airbyte-config/persistence/src/test/resources/nested_object/expectedPaths
new file mode 100644
index 00000000000000..4160e14762291f
--- /dev/null
+++ b/airbyte-config/persistence/src/test/resources/nested_object/expectedPaths
@@ -0,0 +1 @@
+$.password;$.nested.password
diff --git a/airbyte-config/persistence/src/test/resources/nested_object/partial_config.json b/airbyte-config/persistence/src/test/resources/nested_object/partial_config.json
index d056a87ba1c363..e9e44d7ce52ce8 100644
--- a/airbyte-config/persistence/src/test/resources/nested_object/partial_config.json
+++ b/airbyte-config/persistence/src/test/resources/nested_object/partial_config.json
@@ -1,11 +1,11 @@
 {
   "username": "charles",
   "password": {
-    "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_9eba44d8-51e7-48f1-bde2-619af0e42c22_v1"
+    "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_2c2ef2b3-259a-4e73-96d1-f56dacee2e5e_v1"
   },
   "nested": {
     "password": {
-      "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_2c2ef2b3-259a-4e73-96d1-f56dacee2e5e_v1"
+      "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_9eba44d8-51e7-48f1-bde2-619af0e42c22_v1"
     },
     "not_password": 13
   }
diff --git a/airbyte-config/persistence/src/test/resources/nested_object/updated_partial_config.json b/airbyte-config/persistence/src/test/resources/nested_object/updated_partial_config.json
index 0b9ba7d8eb4186..24c73c6d182c92 100644
--- a/airbyte-config/persistence/src/test/resources/nested_object/updated_partial_config.json
+++ b/airbyte-config/persistence/src/test/resources/nested_object/updated_partial_config.json
@@ -1,11 +1,11 @@
 {
   "username": "charles",
   "password": {
-    "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_9eba44d8-51e7-48f1-bde2-619af0e42c22_v2"
+    "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_2c2ef2b3-259a-4e73-96d1-f56dacee2e5e_v2"
   },
   "nested": {
     "password": {
-      "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_2c2ef2b3-259a-4e73-96d1-f56dacee2e5e_v2"
+      "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_9eba44d8-51e7-48f1-bde2-619af0e42c22_v2"
     },
     "not_password": 13
   }
diff --git a/airbyte-config/persistence/src/test/resources/nested_object/updated_partial_config_update1.json b/airbyte-config/persistence/src/test/resources/nested_object/updated_partial_config_update1.json
index 4d76d121174b5f..02accccc92ee73 100644
--- a/airbyte-config/persistence/src/test/resources/nested_object/updated_partial_config_update1.json
+++ b/airbyte-config/persistence/src/test/resources/nested_object/updated_partial_config_update1.json
@@ -1,11 +1,11 @@
 {
   "username": "charles",
   "password": {
-    "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_9eba44d8-51e7-48f1-bde2-619af0e42c22_v2"
+    "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_2c2ef2b3-259a-4e73-96d1-f56dacee2e5e_v2"
   },
   "nested": {
     "password": {
-      "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_2c2ef2b3-259a-4e73-96d1-f56dacee2e5e_v1"
+      "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_9eba44d8-51e7-48f1-bde2-619af0e42c22_v1"
     },
     "not_password": 13
   }
diff --git a/airbyte-config/persistence/src/test/resources/nested_object/updated_partial_config_update2.json b/airbyte-config/persistence/src/test/resources/nested_object/updated_partial_config_update2.json
index 0b9ba7d8eb4186..24c73c6d182c92 100644
--- a/airbyte-config/persistence/src/test/resources/nested_object/updated_partial_config_update2.json
+++ b/airbyte-config/persistence/src/test/resources/nested_object/updated_partial_config_update2.json
@@ -1,11 +1,11 @@
 {
   "username": "charles",
   "password": {
-    "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_9eba44d8-51e7-48f1-bde2-619af0e42c22_v2"
+    "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_2c2ef2b3-259a-4e73-96d1-f56dacee2e5e_v2"
   },
   "nested": {
     "password": {
-      "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_2c2ef2b3-259a-4e73-96d1-f56dacee2e5e_v2"
+      "_secret": "airbyte_workspace_e0eb0554-ffe0-4e9c-9dc0-ed7f52023eb2_secret_9eba44d8-51e7-48f1-bde2-619af0e42c22_v2"
     },
     "not_password": 13
   }
diff --git a/airbyte-config/persistence/src/test/resources/nested_oneof/expectedPaths b/airbyte-config/persistence/src/test/resources/nested_oneof/expectedPaths
new file mode 100644
index 00000000000000..75e6804e2014b1
--- /dev/null
+++ b/airbyte-config/persistence/src/test/resources/nested_oneof/expectedPaths
@@ -0,0 +1 @@
+$.password1.key1;$.password1.key2.key3;$.password1.key2.key4;$.password2.key5;$.password2.key6.key7;$.password2.key6.key8
diff --git a/airbyte-config/persistence/src/test/resources/oneof/expectedPaths b/airbyte-config/persistence/src/test/resources/oneof/expectedPaths
new file mode 100644
index 00000000000000..7fdcd68edaeaa7
--- /dev/null
+++ b/airbyte-config/persistence/src/test/resources/oneof/expectedPaths
@@ -0,0 +1 @@
+$.password1.key1;$.password2.key1;$.password3.key1
diff --git a/airbyte-config/persistence/src/test/resources/optional_password/expectedPaths b/airbyte-config/persistence/src/test/resources/optional_password/expectedPaths
new file mode 100644
index 00000000000000..deb2239ded28e2
--- /dev/null
+++ b/airbyte-config/persistence/src/test/resources/optional_password/expectedPaths
@@ -0,0 +1 @@
+$.password
diff --git a/airbyte-config/persistence/src/test/resources/postgres_ssh_key/expectedPaths b/airbyte-config/persistence/src/test/resources/postgres_ssh_key/expectedPaths
new file mode 100644
index 00000000000000..d60e732b51104e
--- /dev/null
+++ b/airbyte-config/persistence/src/test/resources/postgres_ssh_key/expectedPaths
@@ -0,0 +1 @@
+$.password;$.tunnel_method.ssh_key;$.tunnel_method.tunnel_user_password
diff --git a/airbyte-config/persistence/src/test/resources/simple/expectedPaths b/airbyte-config/persistence/src/test/resources/simple/expectedPaths
new file mode 100644
index 00000000000000..deb2239ded28e2
--- /dev/null
+++ b/airbyte-config/persistence/src/test/resources/simple/expectedPaths
@@ -0,0 +1 @@
+$.password
diff --git a/airbyte-container-orchestrator/Dockerfile b/airbyte-container-orchestrator/Dockerfile
index 68ea502c269525..159cf08bae891a 100644
--- a/airbyte-container-orchestrator/Dockerfile
+++ b/airbyte-container-orchestrator/Dockerfile
@@ -25,7 +25,7 @@ RUN curl -fsSLo /usr/share/keyrings/kubernetes-archive-keyring.gpg https://packa
 RUN echo "deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main" | tee /etc/apt/sources.list.d/kubernetes.list
 RUN apt-get update && apt-get install -y kubectl
 
-ARG VERSION=0.36.3-alpha
+ARG VERSION=0.36.5-alpha
 
 ENV APPLICATION airbyte-container-orchestrator
 ENV VERSION=${VERSION}
diff --git a/airbyte-db/lib/src/main/java/io/airbyte/db/Databases.java b/airbyte-db/lib/src/main/java/io/airbyte/db/Databases.java
index 28dd36cde3629d..1e193409e042ec 100644
--- a/airbyte-db/lib/src/main/java/io/airbyte/db/Databases.java
+++ b/airbyte-db/lib/src/main/java/io/airbyte/db/Databases.java
@@ -10,13 +10,14 @@
 import io.airbyte.db.jdbc.DefaultJdbcDatabase;
 import io.airbyte.db.jdbc.JdbcDatabase;
 import io.airbyte.db.jdbc.JdbcSourceOperations;
-import io.airbyte.db.jdbc.JdbcStreamingQueryConfiguration;
 import io.airbyte.db.jdbc.JdbcUtils;
 import io.airbyte.db.jdbc.StreamingJdbcDatabase;
+import io.airbyte.db.jdbc.streaming.JdbcStreamingQueryConfig;
 import io.airbyte.db.mongodb.MongoDatabase;
 import java.io.IOException;
 import java.util.Map;
 import java.util.function.Function;
+import java.util.function.Supplier;
 import lombok.val;
 import org.apache.commons.dbcp2.BasicDataSource;
 import org.jooq.SQLDialect;
@@ -188,13 +189,13 @@ public static JdbcDatabase createStreamingJdbcDatabase(final String username,
                                                          final String password,
                                                          final String jdbcConnectionString,
                                                          final String driverClassName,
-                                                         final JdbcStreamingQueryConfiguration jdbcStreamingQuery,
+                                                         final Supplier<JdbcStreamingQueryConfig> streamingQueryConfigProvider,
                                                          final Map<String, String> connectionProperties,
                                                          final JdbcCompatibleSourceOperations<?> sourceOperations) {
     final BasicDataSource connectionPool =
         createBasicDataSource(username, password, jdbcConnectionString, driverClassName, connectionProperties);
 
-    return new StreamingJdbcDatabase(connectionPool, sourceOperations, jdbcStreamingQuery);
+    return new StreamingJdbcDatabase(connectionPool, sourceOperations, streamingQueryConfigProvider);
   }
 
   private static BasicDataSource createBasicDataSource(final String username,
diff --git a/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/Db2JdbcStreamingQueryConfiguration.java b/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/Db2JdbcStreamingQueryConfiguration.java
deleted file mode 100644
index a3d5f7974f0425..00000000000000
--- a/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/Db2JdbcStreamingQueryConfiguration.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
- */
-
-package io.airbyte.db.jdbc;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-public class Db2JdbcStreamingQueryConfiguration implements JdbcStreamingQueryConfiguration {
-
-  @Override
-  public void accept(final Connection connection, final PreparedStatement preparedStatement) throws SQLException {
-    connection.setAutoCommit(false);
-    preparedStatement.setFetchSize(1000);
-  }
-
-}
diff --git a/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/JdbcStreamingQueryConfiguration.java b/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/JdbcStreamingQueryConfiguration.java
deleted file mode 100644
index d9486fe33f1605..00000000000000
--- a/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/JdbcStreamingQueryConfiguration.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
- */
-
-package io.airbyte.db.jdbc;
-
-import io.airbyte.commons.functional.CheckedBiConsumer;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-@FunctionalInterface
-public interface JdbcStreamingQueryConfiguration extends CheckedBiConsumer<Connection, PreparedStatement, SQLException> {
-
-}
diff --git a/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/NoOpJdbcStreamingQueryConfiguration.java b/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/NoOpJdbcStreamingQueryConfiguration.java
deleted file mode 100644
index 3330cdfd5b235e..00000000000000
--- a/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/NoOpJdbcStreamingQueryConfiguration.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
- */
-
-package io.airbyte.db.jdbc;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-public class NoOpJdbcStreamingQueryConfiguration implements JdbcStreamingQueryConfiguration {
-
-  @Override
-  public void accept(final Connection connection, final PreparedStatement preparedStatement)
-      throws SQLException {
-
-  }
-
-}
diff --git a/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/OracleJdbcStreamingQueryConfiguration.java b/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/OracleJdbcStreamingQueryConfiguration.java
deleted file mode 100644
index c6ab49b81b1292..00000000000000
--- a/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/OracleJdbcStreamingQueryConfiguration.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
- */
-
-package io.airbyte.db.jdbc;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-public class OracleJdbcStreamingQueryConfiguration implements JdbcStreamingQueryConfiguration {
-
-  @Override
-  public void accept(final Connection connection, final PreparedStatement preparedStatement) throws SQLException {
-    connection.setAutoCommit(false);
-    preparedStatement.setFetchSize(1000);
-  }
-
-}
diff --git a/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/PostgresJdbcStreamingQueryConfiguration.java b/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/PostgresJdbcStreamingQueryConfiguration.java
deleted file mode 100644
index 08977016af16b0..00000000000000
--- a/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/PostgresJdbcStreamingQueryConfiguration.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
- */
-
-package io.airbyte.db.jdbc;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-public class PostgresJdbcStreamingQueryConfiguration implements JdbcStreamingQueryConfiguration {
-
-  @Override
-  public void accept(final Connection connection, final PreparedStatement preparedStatement) throws SQLException {
-    connection.setAutoCommit(false);
-    preparedStatement.setFetchSize(1000);
-  }
-
-}
diff --git a/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/StreamingJdbcDatabase.java b/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/StreamingJdbcDatabase.java
index 338fec362d830c..40ec3e908b9613 100644
--- a/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/StreamingJdbcDatabase.java
+++ b/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/StreamingJdbcDatabase.java
@@ -7,36 +7,42 @@
 import com.google.errorprone.annotations.MustBeClosed;
 import io.airbyte.commons.functional.CheckedFunction;
 import io.airbyte.db.JdbcCompatibleSourceOperations;
+import io.airbyte.db.jdbc.streaming.JdbcStreamingQueryConfig;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
 import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 import javax.sql.DataSource;
 
 /**
- * This database allows a developer to specify a {@link JdbcStreamingQueryConfiguration}. This
- * allows the developer to specify the correct configuration in order for a
- * {@link PreparedStatement} to execute as in a streaming / chunked manner.
+ * This database allows a developer to specify a {@link JdbcStreamingQueryConfig}. This allows the
+ * developer to specify the correct configuration in order for a {@link PreparedStatement} to
+ * execute as in a streaming / chunked manner.
  */
 public class StreamingJdbcDatabase extends DefaultJdbcDatabase {
 
-  private final JdbcStreamingQueryConfiguration jdbcStreamingQueryConfiguration;
+  private final Supplier<JdbcStreamingQueryConfig> streamingQueryConfigProvider;
 
   public StreamingJdbcDatabase(final DataSource dataSource,
                                final JdbcCompatibleSourceOperations<?> sourceOperations,
-                               final JdbcStreamingQueryConfiguration jdbcStreamingQueryConfiguration) {
+                               final Supplier<JdbcStreamingQueryConfig> streamingQueryConfigProvider) {
     super(dataSource, sourceOperations);
-    this.jdbcStreamingQueryConfiguration = jdbcStreamingQueryConfiguration;
+    this.streamingQueryConfigProvider = streamingQueryConfigProvider;
   }
 
   /**
-   * Assuming that the {@link JdbcStreamingQueryConfiguration} is configured correctly for the JDBC
-   * driver being used, this method will return data in streaming / chunked fashion. Review the
-   * provided {@link JdbcStreamingQueryConfiguration} to understand the size of these chunks. If the
-   * entire stream is consumed the database connection will be closed automatically and the caller
-   * need not call close on the returned stream. This query (and the first chunk) are fetched
-   * immediately. Subsequent chunks will not be pulled until the first chunk is consumed.
+   * Assuming that the {@link JdbcStreamingQueryConfig} is configured correctly for the JDBC driver
+   * being used, this method will return data in streaming / chunked fashion. Review the provided
+   * {@link JdbcStreamingQueryConfig} to understand the size of these chunks. If the entire stream is
+   * consumed the database connection will be closed automatically and the caller need not call close
+   * on the returned stream. This query (and the first chunk) are fetched immediately. Subsequent
+   * chunks will not be pulled until the first chunk is consumed.
    *
    * @param statementCreator create a {@link PreparedStatement} from a {@link Connection}.
    * @param recordTransform transform each record of that result set into the desired type. do NOT
@@ -53,10 +59,10 @@ public <T> Stream<T> unsafeQuery(final CheckedFunction<Connection, PreparedState
       throws SQLException {
     try {
       final Connection connection = dataSource.getConnection();
-      final PreparedStatement ps = statementCreator.apply(connection);
-      // allow configuration of connection and prepared statement to make streaming possible.
-      jdbcStreamingQueryConfiguration.accept(connection, ps);
-      return toUnsafeStream(ps.executeQuery(), recordTransform)
+      final PreparedStatement statement = statementCreator.apply(connection);
+      final JdbcStreamingQueryConfig streamingConfig = streamingQueryConfigProvider.get();
+      streamingConfig.initialize(connection, statement);
+      return toUnsafeStream(statement.executeQuery(), recordTransform, streamingConfig)
           .onClose(() -> {
             try {
               connection.setAutoCommit(true);
@@ -70,4 +76,32 @@ public <T> Stream<T> unsafeQuery(final CheckedFunction<Connection, PreparedState
     }
   }
 
+  /**
+   * This method differs from {@link DefaultJdbcDatabase#toUnsafeStream} in that it takes a streaming
+   * config that adjusts the fetch size dynamically according to sampled row size.
+   */
+  protected static <T> Stream<T> toUnsafeStream(final ResultSet resultSet,
+                                                final CheckedFunction<ResultSet, T, SQLException> mapper,
+                                                final JdbcStreamingQueryConfig streamingConfig) {
+    return StreamSupport.stream(new Spliterators.AbstractSpliterator<>(Long.MAX_VALUE, Spliterator.ORDERED) {
+
+      @Override
+      public boolean tryAdvance(final Consumer<? super T> action) {
+        try {
+          if (!resultSet.next()) {
+            resultSet.close();
+            return false;
+          }
+          final T dataRow = mapper.apply(resultSet);
+          streamingConfig.accept(resultSet, dataRow);
+          action.accept(dataRow);
+          return true;
+        } catch (final SQLException e) {
+          throw new RuntimeException(e);
+        }
+      }
+
+    }, false);
+  }
+
 }
diff --git a/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/streaming/AdaptiveStreamingQueryConfig.java b/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/streaming/AdaptiveStreamingQueryConfig.java
new file mode 100644
index 00000000000000..e2f09fa06c6aa0
--- /dev/null
+++ b/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/streaming/AdaptiveStreamingQueryConfig.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.db.jdbc.streaming;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Optional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AdaptiveStreamingQueryConfig implements JdbcStreamingQueryConfig {
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(AdaptiveStreamingQueryConfig.class);
+
+  private final FetchSizeEstimator fetchSizeEstimator;
+  private int currentFetchSize;
+
+  public AdaptiveStreamingQueryConfig() {
+    this.fetchSizeEstimator = TwoStageSizeEstimator.getInstance();
+    this.currentFetchSize = FetchSizeConstants.INITIAL_SAMPLE_SIZE;
+  }
+
+  @Override
+  public void initialize(final Connection connection, final Statement preparedStatement) throws SQLException {
+    connection.setAutoCommit(false);
+    preparedStatement.setFetchSize(FetchSizeConstants.INITIAL_SAMPLE_SIZE);
+    currentFetchSize = FetchSizeConstants.INITIAL_SAMPLE_SIZE;
+    LOGGER.info("Set initial fetch size: {} rows", preparedStatement.getFetchSize());
+  }
+
+  @Override
+  public void accept(final ResultSet resultSet, final Object rowData) throws SQLException {
+    fetchSizeEstimator.accept(rowData);
+    final Optional<Integer> newFetchSize = fetchSizeEstimator.getFetchSize();
+    if (newFetchSize.isPresent() && currentFetchSize != newFetchSize.get()) {
+      currentFetchSize = newFetchSize.get();
+      resultSet.setFetchSize(currentFetchSize);
+      LOGGER.info("Updated fetch size: {} rows", currentFetchSize);
+    }
+  }
+
+}
diff --git a/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/streaming/BaseSizeEstimator.java b/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/streaming/BaseSizeEstimator.java
new file mode 100644
index 00000000000000..aa1a7dcb454bad
--- /dev/null
+++ b/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/streaming/BaseSizeEstimator.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.db.jdbc.streaming;
+
+import com.google.common.annotations.VisibleForTesting;
+import io.airbyte.commons.json.Jsons;
+
+/**
+ * Fetch size (number of rows) = target buffer byte size / mean row byte size
+ */
+public abstract class BaseSizeEstimator implements FetchSizeEstimator {
+
+  // desired buffer size in memory
+  private final long targetBufferByteSize;
+  private final int minFetchSize;
+  private final int defaultFetchSize;
+  private final int maxFetchSize;
+
+  // mean byte size per row
+  protected double meanByteSize = 0.0;
+
+  protected BaseSizeEstimator(final long targetBufferByteSize,
+                              final int minFetchSize,
+                              final int defaultFetchSize,
+                              final int maxFetchSize) {
+    this.targetBufferByteSize = targetBufferByteSize;
+    this.minFetchSize = minFetchSize;
+    this.defaultFetchSize = defaultFetchSize;
+    this.maxFetchSize = maxFetchSize;
+  }
+
+  /**
+   * What we really want is to know how much memory each {@code rowData} takes. However, there is no
+   * easy way to measure that. So we use the byte size of the serialized row to approximate that.
+   */
+  @VisibleForTesting
+  public static long getEstimatedByteSize(final Object rowData) {
+    if (rowData == null) {
+      return 0L;
+    }
+    // The string length is multiplied by 4 assuming each character is a
+    // full UTF-8 character. In reality, a UTF-8 character is encoded as
+    // 1 to 4 bytes. So this is an overestimation. This is alright, because
+    // the whole method only provides an estimation. Please never convert
+    // the string to byte[] to get the exact length. That conversion is known
+    // to introduce a lot of memory overhead.
+    return Jsons.serialize(rowData).length() * 4L;
+  }
+
+  /**
+   * This method ensures that the fetch size is between {@code minFetchSize} and {@code maxFetchSize},
+   * inclusively.
+   */
+  protected int getBoundedFetchSize() {
+    if (meanByteSize <= 0.0) {
+      return defaultFetchSize;
+    }
+    final long rawFetchSize = Math.round(targetBufferByteSize / meanByteSize);
+    if (rawFetchSize > Integer.MAX_VALUE) {
+      return maxFetchSize;
+    }
+    return Math.max(minFetchSize, Math.min(maxFetchSize, (int) rawFetchSize));
+  }
+
+  double getMeanRowByteSize() {
+    return meanByteSize;
+  }
+
+}
diff --git a/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/streaming/FetchSizeConstants.java b/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/streaming/FetchSizeConstants.java
new file mode 100644
index 00000000000000..2e92ce66e476db
--- /dev/null
+++ b/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/streaming/FetchSizeConstants.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.db.jdbc.streaming;
+
+public final class FetchSizeConstants {
+
+  // The desired buffer size in memory to store the fetched rows.
+  // This size is not enforced. It is only used to calculate a proper
+  // fetch size. The max row size the connector can handle is actually
+  // limited by the heap size.
+  public static final long TARGET_BUFFER_BYTE_SIZE = 200L * 1024L * 1024L; // 200 MB
+  // sample size for making the first estimation of the row size
+  public static final int INITIAL_SAMPLE_SIZE = 10;
+  // sample size for making the post-initial estimation of the row size
+  public static final int POST_INITIAL_SAMPLE_SIZE = 10;
+  // sample every N rows during the post-initial stage
+  public static final int SAMPLE_FREQUENCY = 100;
+
+  public static final int MIN_FETCH_SIZE = 1;
+  public static final int DEFAULT_FETCH_SIZE = 1000;
+  public static final int MAX_FETCH_SIZE = 100_000;
+
+  private FetchSizeConstants() {}
+
+}
diff --git a/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/streaming/FetchSizeEstimator.java b/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/streaming/FetchSizeEstimator.java
new file mode 100644
index 00000000000000..12bff10708dcd7
--- /dev/null
+++ b/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/streaming/FetchSizeEstimator.java
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.db.jdbc.streaming;
+
+import java.util.Optional;
+import java.util.function.Consumer;
+
+public interface FetchSizeEstimator extends Consumer<Object> {
+
+  /**
+   * @return the estimated fetch size when the estimation is ready
+   */
+  Optional<Integer> getFetchSize();
+
+}
diff --git a/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/streaming/InitialSizeEstimator.java b/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/streaming/InitialSizeEstimator.java
new file mode 100644
index 00000000000000..af3b3ed3112496
--- /dev/null
+++ b/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/streaming/InitialSizeEstimator.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.db.jdbc.streaming;
+
+import java.util.Optional;
+
+/**
+ * This class estimates the mean row byte size by measuring the first consecutive
+ * {@code initialSampleSize} rows.
+ */
+public class InitialSizeEstimator extends BaseSizeEstimator implements FetchSizeEstimator {
+
+  private final int sampleSize;
+  private int counter = 0;
+
+  public InitialSizeEstimator(final long bufferByteSize,
+                              final int initialSampleSize,
+                              final int minFetchSize,
+                              final int defaultFetchSize,
+                              final int maxFetchSize) {
+    super(bufferByteSize, minFetchSize, defaultFetchSize, maxFetchSize);
+    this.sampleSize = initialSampleSize;
+  }
+
+  @Override
+  public void accept(final Object row) {
+    final long byteSize = getEstimatedByteSize(row);
+    // divide each byteSize by sampleSize to prevent overflow
+    meanByteSize += 1.0 * byteSize / sampleSize;
+    counter++;
+  }
+
+  @Override
+  public Optional<Integer> getFetchSize() {
+    if (counter < sampleSize) {
+      return Optional.empty();
+    }
+    return Optional.of(getBoundedFetchSize());
+  }
+
+}
diff --git a/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/streaming/JdbcStreamingQueryConfig.java b/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/streaming/JdbcStreamingQueryConfig.java
new file mode 100644
index 00000000000000..3d92c0c9249221
--- /dev/null
+++ b/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/streaming/JdbcStreamingQueryConfig.java
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.db.jdbc.streaming;
+
+import io.airbyte.commons.functional.CheckedBiConsumer;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+public interface JdbcStreamingQueryConfig extends CheckedBiConsumer<ResultSet, Object, SQLException> {
+
+  void initialize(final Connection connection, final Statement statement) throws SQLException;
+
+}
diff --git a/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/streaming/NoOpStreamingQueryConfig.java b/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/streaming/NoOpStreamingQueryConfig.java
new file mode 100644
index 00000000000000..79fcf1db42c472
--- /dev/null
+++ b/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/streaming/NoOpStreamingQueryConfig.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.db.jdbc.streaming;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+public class NoOpStreamingQueryConfig implements JdbcStreamingQueryConfig {
+
+  @Override
+  public void initialize(final Connection connection, final Statement preparedStatement) throws SQLException {}
+
+  @Override
+  public void accept(final ResultSet resultSet, final Object o) throws SQLException {}
+
+}
diff --git a/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/streaming/SamplingSizeEstimator.java b/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/streaming/SamplingSizeEstimator.java
new file mode 100644
index 00000000000000..b065140fa4d124
--- /dev/null
+++ b/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/streaming/SamplingSizeEstimator.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.db.jdbc.streaming;
+
+import java.util.Optional;
+
+/**
+ * This class adjusts the mean row byte size by estimating one row out of every
+ * {@code sampleFrequency} rows.
+ */
+public class SamplingSizeEstimator extends BaseSizeEstimator implements FetchSizeEstimator {
+
+  private final int sampleSize;
+  private final int sampleFrequency;
+
+  private int counter = 0;
+  private boolean hasNewEstimation = false;
+
+  public SamplingSizeEstimator(final long bufferByteSize,
+                               final int sampleSize,
+                               final int sampleFrequency,
+                               final double initialRowByteSize,
+                               final int minFetchSize,
+                               final int defaultFetchSize,
+                               final int maxFetchSize) {
+    super(bufferByteSize, minFetchSize, defaultFetchSize, maxFetchSize);
+    this.sampleSize = sampleSize;
+    this.sampleFrequency = sampleFrequency;
+    this.meanByteSize = initialRowByteSize;
+  }
+
+  @Override
+  public void accept(final Object row) {
+    counter++;
+    if (counter < sampleFrequency) {
+      return;
+    }
+
+    counter = 0;
+    final long rowByteSize = getEstimatedByteSize(row);
+    if (rowByteSize != Math.round(meanByteSize)) {
+      // This is equivalent to calculating the mean size
+      // based on the last N rows. The division is performed
+      // first to prevent overflow.
+      meanByteSize = meanByteSize / sampleSize * (sampleSize - 1) + 1.0 * rowByteSize / sampleSize;
+      hasNewEstimation = true;
+    }
+  }
+
+  @Override
+  public Optional<Integer> getFetchSize() {
+    if (!hasNewEstimation) {
+      return Optional.empty();
+    }
+
+    hasNewEstimation = false;
+    return Optional.of(getBoundedFetchSize());
+  }
+
+}
diff --git a/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/streaming/TwoStageSizeEstimator.java b/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/streaming/TwoStageSizeEstimator.java
new file mode 100644
index 00000000000000..9e819f1ab3a151
--- /dev/null
+++ b/airbyte-db/lib/src/main/java/io/airbyte/db/jdbc/streaming/TwoStageSizeEstimator.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.db.jdbc.streaming;
+
+import com.google.common.annotations.VisibleForTesting;
+import java.util.Optional;
+
+/**
+ * This estimator first uses the {@link InitialSizeEstimator} to calculate an initial fetch size by
+ * sampling the first N rows consecutively, and then switches to {@link SamplingSizeEstimator} to
+ * periodically adjust the fetch size by sampling every M rows.
+ */
+public class TwoStageSizeEstimator implements FetchSizeEstimator {
+
+  private final int initialSampleSize;
+  private BaseSizeEstimator delegate;
+  private int counter = 0;
+
+  public static TwoStageSizeEstimator getInstance() {
+    return new TwoStageSizeEstimator();
+  }
+
+  private TwoStageSizeEstimator() {
+    this.initialSampleSize = FetchSizeConstants.INITIAL_SAMPLE_SIZE;
+    this.delegate = new InitialSizeEstimator(
+        FetchSizeConstants.TARGET_BUFFER_BYTE_SIZE,
+        initialSampleSize,
+        FetchSizeConstants.MIN_FETCH_SIZE,
+        FetchSizeConstants.DEFAULT_FETCH_SIZE,
+        FetchSizeConstants.MAX_FETCH_SIZE);
+  }
+
+  @Override
+  public Optional<Integer> getFetchSize() {
+    return delegate.getFetchSize();
+  }
+
+  @Override
+  public void accept(final Object rowData) {
+    if (counter <= initialSampleSize + 1) {
+      counter++;
+      // switch to SamplingSizeEstimator after the initial N rows
+      if (delegate instanceof InitialSizeEstimator && counter > initialSampleSize) {
+        delegate = new SamplingSizeEstimator(
+            FetchSizeConstants.TARGET_BUFFER_BYTE_SIZE,
+            FetchSizeConstants.POST_INITIAL_SAMPLE_SIZE,
+            FetchSizeConstants.SAMPLE_FREQUENCY,
+            delegate.getMeanRowByteSize(),
+            FetchSizeConstants.MIN_FETCH_SIZE,
+            FetchSizeConstants.DEFAULT_FETCH_SIZE,
+            FetchSizeConstants.MAX_FETCH_SIZE);
+      }
+    }
+
+    delegate.accept(rowData);
+  }
+
+  @VisibleForTesting
+  BaseSizeEstimator getDelegate() {
+    return delegate;
+  }
+
+}
diff --git a/airbyte-db/lib/src/test/java/io/airbyte/db/jdbc/TestStreamingJdbcDatabase.java b/airbyte-db/lib/src/test/java/io/airbyte/db/jdbc/TestStreamingJdbcDatabase.java
index f1b60896081bd0..e5e8b350755112 100644
--- a/airbyte-db/lib/src/test/java/io/airbyte/db/jdbc/TestStreamingJdbcDatabase.java
+++ b/airbyte-db/lib/src/test/java/io/airbyte/db/jdbc/TestStreamingJdbcDatabase.java
@@ -5,9 +5,8 @@
 package io.airbyte.db.jdbc;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.collect.ImmutableMap;
@@ -15,47 +14,50 @@
 import io.airbyte.commons.io.IOs;
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.commons.string.Strings;
+import io.airbyte.db.jdbc.streaming.AdaptiveStreamingQueryConfig;
+import io.airbyte.db.jdbc.streaming.FetchSizeConstants;
 import io.airbyte.test.utils.PostgreSQLContainerHelper;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.apache.commons.dbcp2.BasicDataSource;
+import org.elasticsearch.common.collect.Map;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
 import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.utility.MountableFile;
 
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class TestStreamingJdbcDatabase {
 
-  private static final List<JsonNode> RECORDS_AS_JSON = Lists.newArrayList(
-      Jsons.jsonNode(ImmutableMap.of("id", 1, "name", "picard")),
-      Jsons.jsonNode(ImmutableMap.of("id", 2, "name", "crusher")),
-      Jsons.jsonNode(ImmutableMap.of("id", 3, "name", "vash")));
-
   private static PostgreSQLContainer<?> PSQL_DB;
-
-  private JdbcStreamingQueryConfiguration jdbcStreamingQueryConfiguration;
+  private final JdbcSourceOperations sourceOperations = JdbcUtils.getDefaultSourceOperations();
   private JdbcDatabase defaultJdbcDatabase;
   private JdbcDatabase streamingJdbcDatabase;
-  private final JdbcSourceOperations sourceOperations = JdbcUtils.getDefaultSourceOperations();
 
   @BeforeAll
   static void init() {
     PSQL_DB = new PostgreSQLContainer<>("postgres:13-alpine");
     PSQL_DB.start();
+  }
 
+  @AfterAll
+  static void cleanUp() {
+    PSQL_DB.close();
   }
 
   @BeforeEach
-  void setup() throws Exception {
-    jdbcStreamingQueryConfiguration = mock(JdbcStreamingQueryConfiguration.class);
-
+  void setup() {
     final String dbName = Strings.addRandomSuffix("db", "_", 10);
 
     final JsonNode config = getConfig(PSQL_DB, dbName);
@@ -74,37 +76,83 @@ void setup() throws Exception {
         config.get("database").asText()));
 
     defaultJdbcDatabase = spy(new DefaultJdbcDatabase(connectionPool));
-    streamingJdbcDatabase = new StreamingJdbcDatabase(connectionPool, JdbcUtils.getDefaultSourceOperations(), jdbcStreamingQueryConfiguration);
+    streamingJdbcDatabase = new StreamingJdbcDatabase(connectionPool, JdbcUtils.getDefaultSourceOperations(), AdaptiveStreamingQueryConfig::new);
+  }
 
+  @Test
+  @Order(1)
+  void testQuery() throws SQLException {
     defaultJdbcDatabase.execute(connection -> {
-      connection.createStatement().execute("CREATE TABLE id_and_name(id INTEGER, name VARCHAR(200));");
-      connection.createStatement().execute("INSERT INTO id_and_name (id, name) VALUES (1,'picard'),  (2, 'crusher'), (3, 'vash');");
+      connection.createStatement().execute(
+          """
+          DROP TABLE IF EXISTS id_and_name;
+          CREATE TABLE id_and_name (id INTEGER, name VARCHAR(200));
+          INSERT INTO id_and_name (id, name) VALUES (1, 'picard'),  (2, 'crusher'), (3, 'vash');
+          """);
     });
-  }
 
-  @AfterAll
-  static void cleanUp() {
-    PSQL_DB.close();
+    // grab references to connection and prepared statement, so we can verify the streaming config is
+    // invoked.
+    final AtomicReference<Connection> connection1 = new AtomicReference<>();
+    final AtomicReference<PreparedStatement> ps1 = new AtomicReference<>();
+    try (final Stream<JsonNode> actual = streamingJdbcDatabase.unsafeQuery(
+        connection -> {
+          connection1.set(connection);
+          final PreparedStatement ps = connection.prepareStatement("SELECT * FROM id_and_name;");
+          ps1.set(ps);
+          return ps;
+        },
+        sourceOperations::rowToJson)) {
+      final List<JsonNode> expectedRecords = Lists.newArrayList(
+          Jsons.jsonNode(Map.of("id", 1, "name", "picard")),
+          Jsons.jsonNode(Map.of("id", 2, "name", "crusher")),
+          Jsons.jsonNode(Map.of("id", 3, "name", "vash")));
+      assertEquals(expectedRecords, actual.toList());
+    }
   }
 
+  /**
+   * Test stream querying a table with 20 rows. Each row is 10 MB large. The table in this test must
+   * contain more than {@code
+   * FetchSizeConstants.INITIAL_SAMPLE_SIZE} rows. Otherwise, all rows will be fetched in the first
+   * fetch, the fetch size won't be adjusted, and the test will fail.
+   */
+  @Order(2)
   @Test
-  void testQuery() throws SQLException {
-    // grab references to connection and prepared statement so we can verify the streaming config is
-    // invoked.
+  void testLargeRow() throws SQLException {
+    defaultJdbcDatabase.execute(connection -> connection.createStatement()
+        .execute(
+            """
+            DROP TABLE IF EXISTS id_and_name;
+            CREATE TABLE id_and_name (id INTEGER, name TEXT);
+            INSERT INTO id_and_name SELECT id, repeat('a', 10485760) as name from generate_series(1, 20) as id;
+            """));
+
     final AtomicReference<Connection> connection1 = new AtomicReference<>();
     final AtomicReference<PreparedStatement> ps1 = new AtomicReference<>();
-    final Stream<JsonNode> actual = streamingJdbcDatabase.unsafeQuery(
+    final Set<Integer> fetchSizes = new HashSet<>();
+    try (final Stream<JsonNode> actual = streamingJdbcDatabase.unsafeQuery(
         connection -> {
           connection1.set(connection);
           final PreparedStatement ps = connection.prepareStatement("SELECT * FROM id_and_name;");
           ps1.set(ps);
           return ps;
         },
-        sourceOperations::rowToJson);
-
-    assertEquals(RECORDS_AS_JSON, actual.collect(Collectors.toList()));
-    // verify that the query configuration is invoked.
-    verify(jdbcStreamingQueryConfiguration).accept(connection1.get(), ps1.get());
+        resultSet -> {
+          fetchSizes.add(resultSet.getFetchSize());
+          return sourceOperations.rowToJson(resultSet);
+        })) {
+      assertEquals(20, actual.count());
+
+      // Two fetch sizes should be set on the result set, one is the initial sample size,
+      // and the other is smaller than the initial value because of the large row.
+      // This check assumes that FetchSizeConstants.TARGET_BUFFER_BYTE_SIZE = 200 MB.
+      // Update this check if the buffer size constant is changed.
+      assertEquals(2, fetchSizes.size());
+      final List<Integer> sortedSizes = fetchSizes.stream().sorted().toList();
+      assertTrue(sortedSizes.get(0) < FetchSizeConstants.INITIAL_SAMPLE_SIZE);
+      assertEquals(FetchSizeConstants.INITIAL_SAMPLE_SIZE, sortedSizes.get(1));
+    }
   }
 
   private JsonNode getConfig(final PostgreSQLContainer<?> psqlDb, final String dbName) {
diff --git a/airbyte-db/lib/src/test/java/io/airbyte/db/jdbc/streaming/AdaptiveStreamingQueryConfigTest.java b/airbyte-db/lib/src/test/java/io/airbyte/db/jdbc/streaming/AdaptiveStreamingQueryConfigTest.java
new file mode 100644
index 00000000000000..1a9fd943b504c4
--- /dev/null
+++ b/airbyte-db/lib/src/test/java/io/airbyte/db/jdbc/streaming/AdaptiveStreamingQueryConfigTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.db.jdbc.streaming;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import joptsimple.internal.Strings;
+import org.junit.jupiter.api.Test;
+
+class AdaptiveStreamingQueryConfigTest {
+
+  @Test
+  public void testFetchSizeUpdate() throws SQLException {
+    final AdaptiveStreamingQueryConfig queryConfig = new AdaptiveStreamingQueryConfig();
+    final ResultSet resultSet = mock(ResultSet.class);
+    for (int i = 0; i < FetchSizeConstants.INITIAL_SAMPLE_SIZE - 1; ++i) {
+      queryConfig.accept(resultSet, Strings.repeat(Character.forDigit(i, 10), i + 1));
+      verify(resultSet, never()).setFetchSize(anyInt());
+    }
+    queryConfig.accept(resultSet, "final sampling in the initial stage");
+    verify(resultSet, times(1)).setFetchSize(anyInt());
+    queryConfig.accept(resultSet, "abcd");
+  }
+
+}
diff --git a/airbyte-db/lib/src/test/java/io/airbyte/db/jdbc/streaming/BaseSizeEstimatorTest.java b/airbyte-db/lib/src/test/java/io/airbyte/db/jdbc/streaming/BaseSizeEstimatorTest.java
new file mode 100644
index 00000000000000..eccf1be3b12064
--- /dev/null
+++ b/airbyte-db/lib/src/test/java/io/airbyte/db/jdbc/streaming/BaseSizeEstimatorTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.db.jdbc.streaming;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import io.airbyte.commons.json.Jsons;
+import java.util.Map;
+import java.util.Optional;
+import org.junit.jupiter.api.Test;
+
+class BaseSizeEstimatorTest {
+
+  @Test
+  public void testGetEstimatedByteSize() {
+    assertEquals(0L, BaseSizeEstimator.getEstimatedByteSize(null));
+    assertEquals(28L, BaseSizeEstimator.getEstimatedByteSize("12345"));
+    assertEquals(60L, BaseSizeEstimator.getEstimatedByteSize(Jsons.jsonNode(Map.of("key", "value"))));
+  }
+
+  public static class TestSizeEstimator extends BaseSizeEstimator {
+
+    protected TestSizeEstimator(final long bufferByteSize, final int minFetchSize, final int defaultFetchSize, final int maxFetchSize) {
+      super(bufferByteSize, minFetchSize, defaultFetchSize, maxFetchSize);
+    }
+
+    @Override
+    public Optional<Integer> getFetchSize() {
+      return Optional.empty();
+    }
+
+    @Override
+    public void accept(final Object o) {}
+
+    public void setMeanByteSize(final double meanByteSize) {
+      this.meanByteSize = meanByteSize;
+    }
+
+  }
+
+  @Test
+  public void testGetBoundedFetchSize() {
+    final long bufferByteSize = 120;
+    final int minFetchSize = 10;
+    final int defaultFetchSize = 20;
+    final int maxFetchSize = 40;
+    final TestSizeEstimator sizeEstimator = new TestSizeEstimator(bufferByteSize, minFetchSize, defaultFetchSize, maxFetchSize);
+
+    sizeEstimator.setMeanByteSize(-1.0);
+    assertEquals(defaultFetchSize, sizeEstimator.getBoundedFetchSize());
+
+    sizeEstimator.setMeanByteSize(0.0);
+    assertEquals(defaultFetchSize, sizeEstimator.getBoundedFetchSize());
+
+    // fetch size = 5 < min fetch size
+    sizeEstimator.setMeanByteSize(bufferByteSize / 5.0);
+    assertEquals(minFetchSize, sizeEstimator.getBoundedFetchSize());
+
+    // fetch size = 10 within [min fetch size, max fetch size]
+    sizeEstimator.setMeanByteSize(bufferByteSize / 10.0);
+    assertEquals(10, sizeEstimator.getBoundedFetchSize());
+
+    // fetch size = 30 within [min fetch size, max fetch size]
+    sizeEstimator.setMeanByteSize(bufferByteSize / 30.0);
+    assertEquals(30, sizeEstimator.getBoundedFetchSize());
+
+    // fetch size = 40 within [min fetch size, max fetch size]
+    sizeEstimator.setMeanByteSize(bufferByteSize / 40.0);
+    assertEquals(40, sizeEstimator.getBoundedFetchSize());
+
+    // fetch size = 60 > max fetch size
+    sizeEstimator.setMeanByteSize(bufferByteSize / 60.0);
+    assertEquals(maxFetchSize, sizeEstimator.getBoundedFetchSize());
+  }
+
+}
diff --git a/airbyte-db/lib/src/test/java/io/airbyte/db/jdbc/streaming/InitialSizeEstimatorTest.java b/airbyte-db/lib/src/test/java/io/airbyte/db/jdbc/streaming/InitialSizeEstimatorTest.java
new file mode 100644
index 00000000000000..219d0e696273a4
--- /dev/null
+++ b/airbyte-db/lib/src/test/java/io/airbyte/db/jdbc/streaming/InitialSizeEstimatorTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.db.jdbc.streaming;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.Optional;
+import org.junit.jupiter.api.Test;
+
+class InitialSizeEstimatorTest {
+
+  @Test
+  public void testIt() {
+    final long bufferByteSize = 120;
+    final int initialSampleSize = 5;
+    final int minFetchSize = 1;
+    final int defaultFetchSize = 20;
+    final int maxFetchSize = 120;
+    final InitialSizeEstimator sizeEstimator = new InitialSizeEstimator(
+        bufferByteSize,
+        initialSampleSize,
+        minFetchSize,
+        defaultFetchSize,
+        maxFetchSize);
+
+    // size: 3 * 4 = 12
+    sizeEstimator.accept("1");
+    assertFalse(sizeEstimator.getFetchSize().isPresent());
+    // size: 4 * 4 = 16
+    sizeEstimator.accept("11");
+    assertFalse(sizeEstimator.getFetchSize().isPresent());
+    // size: 5 * 4 = 20
+    sizeEstimator.accept("111");
+    assertFalse(sizeEstimator.getFetchSize().isPresent());
+    // size: 6 * 4 = 24
+    sizeEstimator.accept("1111");
+    assertFalse(sizeEstimator.getFetchSize().isPresent());
+    // size: 7 * 4 = 28, fetch size is available
+    sizeEstimator.accept("11111");
+    final Optional<Integer> fetchSize = sizeEstimator.getFetchSize();
+    assertTrue(fetchSize.isPresent());
+    final long expectedMeanByteSize = 20L;
+    assertEquals(expectedMeanByteSize, Math.round(sizeEstimator.getMeanRowByteSize()));
+    assertEquals(bufferByteSize / expectedMeanByteSize, fetchSize.get().longValue());
+  }
+
+}
diff --git a/airbyte-db/lib/src/test/java/io/airbyte/db/jdbc/streaming/SamplingSizeEstimatorTest.java b/airbyte-db/lib/src/test/java/io/airbyte/db/jdbc/streaming/SamplingSizeEstimatorTest.java
new file mode 100644
index 00000000000000..c5a470891a707b
--- /dev/null
+++ b/airbyte-db/lib/src/test/java/io/airbyte/db/jdbc/streaming/SamplingSizeEstimatorTest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.db.jdbc.streaming;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.Optional;
+import org.junit.jupiter.api.Test;
+
+class SamplingSizeEstimatorTest {
+
+  @Test
+  public void testIt() {
+    final long bufferByteSize = 120;
+    final int sampleSize = 2;
+    final int sampleFrequency = 3;
+    final long initialByteSize = 30;
+    final int minFetchSize = 1;
+    final int defaultFetchSize = 20;
+    final int maxFetchSize = 120;
+    final SamplingSizeEstimator sizeEstimator = new SamplingSizeEstimator(
+        bufferByteSize,
+        sampleSize,
+        sampleFrequency,
+        initialByteSize,
+        minFetchSize,
+        defaultFetchSize,
+        maxFetchSize);
+
+    double meanByteSize = initialByteSize;
+
+    // size: 3 * 4 = 12, not sampled
+    sizeEstimator.accept("1");
+    assertFalse(sizeEstimator.getFetchSize().isPresent());
+    assertEquals(meanByteSize, sizeEstimator.getMeanRowByteSize());
+
+    // size: 4 * 4 = 16, not sampled
+    sizeEstimator.accept("11");
+    assertFalse(sizeEstimator.getFetchSize().isPresent());
+    assertEquals(meanByteSize, sizeEstimator.getMeanRowByteSize());
+
+    // size: 5 * 4 = 20, sampled, fetch size is ready
+    sizeEstimator.accept("111");
+    final Optional<Integer> fetchSize1 = sizeEstimator.getFetchSize();
+    assertTrue(fetchSize1.isPresent());
+    meanByteSize = (meanByteSize + 20) / 2.0;
+    assertDoubleEquals(meanByteSize, sizeEstimator.getMeanRowByteSize());
+    assertDoubleEquals(bufferByteSize / meanByteSize, fetchSize1.get().doubleValue());
+
+    // size: 6 * 4 = 24, not sampled
+    sizeEstimator.accept("1111");
+    assertFalse(sizeEstimator.getFetchSize().isPresent());
+    assertDoubleEquals(meanByteSize, sizeEstimator.getMeanRowByteSize());
+
+    // size: 7 * 4 = 28, not sampled
+    sizeEstimator.accept("11111");
+    assertFalse(sizeEstimator.getFetchSize().isPresent());
+    assertDoubleEquals(meanByteSize, sizeEstimator.getMeanRowByteSize());
+
+    // size: 8 * 4 = 32, sampled, fetch size is ready
+    sizeEstimator.accept("111111");
+    final Optional<Integer> fetchSize2 = sizeEstimator.getFetchSize();
+    assertTrue(fetchSize2.isPresent());
+    meanByteSize = (meanByteSize + 32) / 2.0;
+    assertDoubleEquals(meanByteSize, sizeEstimator.getMeanRowByteSize());
+    assertDoubleEquals(bufferByteSize / meanByteSize, fetchSize2.get().doubleValue());
+  }
+
+  private static void assertDoubleEquals(final double expected, final double actual) {
+    assertEquals(Math.round(expected), Math.round(actual));
+  }
+
+}
diff --git a/airbyte-db/lib/src/test/java/io/airbyte/db/jdbc/streaming/TwoStageSizeEstimatorTest.java b/airbyte-db/lib/src/test/java/io/airbyte/db/jdbc/streaming/TwoStageSizeEstimatorTest.java
new file mode 100644
index 00000000000000..a49bb8bd85dd53
--- /dev/null
+++ b/airbyte-db/lib/src/test/java/io/airbyte/db/jdbc/streaming/TwoStageSizeEstimatorTest.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.db.jdbc.streaming;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+
+class TwoStageSizeEstimatorTest {
+
+  @Test
+  public void testDelegationSwitch() {
+    final TwoStageSizeEstimator sizeEstimator = TwoStageSizeEstimator.getInstance();
+    for (int i = 0; i < FetchSizeConstants.INITIAL_SAMPLE_SIZE; ++i) {
+      sizeEstimator.accept("1");
+      assertTrue(sizeEstimator.getDelegate() instanceof InitialSizeEstimator);
+    }
+    // delegation is changed after initial sampling
+    for (int i = 0; i < 3; ++i) {
+      sizeEstimator.accept("1");
+      assertTrue(sizeEstimator.getDelegate() instanceof SamplingSizeEstimator);
+    }
+  }
+
+}
diff --git a/airbyte-integrations/bases/standard-source-test/src/main/java/io/airbyte/integrations/standardtest/source/AbstractSourceConnectorTest.java b/airbyte-integrations/bases/standard-source-test/src/main/java/io/airbyte/integrations/standardtest/source/AbstractSourceConnectorTest.java
index 02aeaacb3fde86..9bc01f2f7208af 100644
--- a/airbyte-integrations/bases/standard-source-test/src/main/java/io/airbyte/integrations/standardtest/source/AbstractSourceConnectorTest.java
+++ b/airbyte-integrations/bases/standard-source-test/src/main/java/io/airbyte/integrations/standardtest/source/AbstractSourceConnectorTest.java
@@ -140,6 +140,13 @@ protected StandardCheckConnectionOutput runCheck() throws Exception {
             .run(new StandardCheckConnectionInput().withConnectionConfiguration(getConfig()), jobRoot);
   }
 
+  protected String runCheckAndGetStatusAsString(JsonNode config) throws Exception {
+    return new DefaultCheckConnectionWorker(
+        workerConfigs,
+        new AirbyteIntegrationLauncher(JOB_ID, JOB_ATTEMPT, getImageName(), processFactory, workerConfigs.getResourceRequirements()))
+            .run(new StandardCheckConnectionInput().withConnectionConfiguration(config), jobRoot).getStatus().toString();
+  }
+
   protected AirbyteCatalog runDiscover() throws Exception {
     return new DefaultDiscoverCatalogWorker(
         workerConfigs,
diff --git a/airbyte-integrations/connector-templates/source-java-jdbc/src/main/java/io/airbyte/integrations/source/{{snakeCase name}}/{{pascalCase name}}Source.java.hbs b/airbyte-integrations/connector-templates/source-java-jdbc/src/main/java/io/airbyte/integrations/source/{{snakeCase name}}/{{pascalCase name}}Source.java.hbs
index 7cb625a2998336..d7babcc57203b0 100644
--- a/airbyte-integrations/connector-templates/source-java-jdbc/src/main/java/io/airbyte/integrations/source/{{snakeCase name}}/{{pascalCase name}}Source.java.hbs	
+++ b/airbyte-integrations/connector-templates/source-java-jdbc/src/main/java/io/airbyte/integrations/source/{{snakeCase name}}/{{pascalCase name}}Source.java.hbs	
@@ -6,7 +6,7 @@ package io.airbyte.integrations.source.{{snakeCase name}};
 
 import com.fasterxml.jackson.databind.JsonNode;
 import io.airbyte.db.jdbc.JdbcUtils;
-import io.airbyte.db.jdbc.NoOpJdbcStreamingQueryConfiguration;
+import io.airbyte.db.jdbc.streaming.NoOpStreamingQueryConfig;
 import io.airbyte.integrations.base.IntegrationRunner;
 import io.airbyte.integrations.base.Source;
 import io.airbyte.integrations.source.jdbc.AbstractJdbcSource;
@@ -23,9 +23,9 @@ public class {{pascalCase name}}Source extends AbstractJdbcSource<JDBCType> impl
   static final String DRIVER_CLASS = "driver_name_here";
 
   public {{pascalCase name}}Source() {
-    // By default, NoOpJdbcStreamingQueryConfiguration class is used, but may be updated. See example
-    // MssqlJdbcStreamingQueryConfiguration
-    super(DRIVER_CLASS, new NoOpJdbcStreamingQueryConfiguration(), JdbcUtils.getDefaultSourceOperations());
+    // By default, NoOpStreamingQueryConfig class is used. If the JDBC supports custom
+    // fetch size, change it to AdaptiveStreamingQueryConfig for better performance.
+    super(DRIVER_CLASS, NoOpStreamingQueryConfig::new, JdbcUtils.getDefaultSourceOperations());
   }
 
   // TODO The config is based on spec.json, update according to your DB
diff --git a/airbyte-integrations/connectors/destination-databricks/src/main/java/io/airbyte/integrations/destination/databricks/DatabricksConstants.java b/airbyte-integrations/connectors/destination-databricks/src/main/java/io/airbyte/integrations/destination/databricks/DatabricksConstants.java
index f3d014d63726bc..4a5c1a4b146af0 100644
--- a/airbyte-integrations/connectors/destination-databricks/src/main/java/io/airbyte/integrations/destination/databricks/DatabricksConstants.java
+++ b/airbyte-integrations/connectors/destination-databricks/src/main/java/io/airbyte/integrations/destination/databricks/DatabricksConstants.java
@@ -15,7 +15,6 @@ public class DatabricksConstants {
       "delta.autoOptimize.optimizeWrite = true",
       "delta.autoOptimize.autoCompact = true");
 
-  private DatabricksConstants() {
-  }
+  private DatabricksConstants() {}
 
 }
diff --git a/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/SqlOperations.java b/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/SqlOperations.java
index 3d4eea93012b52..37212fcff9e1d1 100644
--- a/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/SqlOperations.java
+++ b/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/SqlOperations.java
@@ -21,7 +21,7 @@ public interface SqlOperations {
   /**
    * Create a schema with provided name if it does not already exist.
    *
-   * @param database   Database that the connector is syncing
+   * @param database Database that the connector is syncing
    * @param schemaName Name of schema.
    * @throws Exception exception
    */
@@ -30,7 +30,7 @@ public interface SqlOperations {
   /**
    * Denotes whether the schema exists in destination database
    *
-   * @param database   Database that the connector is syncing
+   * @param database Database that the connector is syncing
    * @param schemaName Name of schema.
    * @return true if the schema exists in destination database, false if it doesn't
    */
@@ -41,9 +41,9 @@ default boolean isSchemaExists(final JdbcDatabase database, final String schemaN
   /**
    * Create a table with provided name in provided schema if it does not already exist.
    *
-   * @param database   Database that the connector is syncing
+   * @param database Database that the connector is syncing
    * @param schemaName Name of schema
-   * @param tableName  Name of table
+   * @param tableName Name of table
    * @throws Exception exception
    */
   void createTableIfNotExists(JdbcDatabase database, String schemaName, String tableName) throws Exception;
@@ -51,9 +51,9 @@ default boolean isSchemaExists(final JdbcDatabase database, final String schemaN
   /**
    * Query to create a table with provided name in provided schema if it does not already exist.
    *
-   * @param database   Database that the connector is syncing
+   * @param database Database that the connector is syncing
    * @param schemaName Name of schema
-   * @param tableName  Name of table
+   * @param tableName Name of table
    * @return query
    */
   String createTableQuery(JdbcDatabase database, String schemaName, String tableName);
@@ -62,7 +62,7 @@ default boolean isSchemaExists(final JdbcDatabase database, final String schemaN
    * Drop the table if it exists.
    *
    * @param schemaName Name of schema
-   * @param tableName  Name of table
+   * @param tableName Name of table
    * @throws Exception exception
    */
   void dropTableIfExists(JdbcDatabase database, String schemaName, String tableName) throws Exception;
@@ -70,9 +70,9 @@ default boolean isSchemaExists(final JdbcDatabase database, final String schemaN
   /**
    * Query to remove all records from a table. Assumes the table exists.
    *
-   * @param database   Database that the connector is syncing
+   * @param database Database that the connector is syncing
    * @param schemaName Name of schema
-   * @param tableName  Name of table
+   * @param tableName Name of table
    * @return Query
    */
   String truncateTableQuery(JdbcDatabase database, String schemaName, String tableName);
@@ -80,20 +80,21 @@ default boolean isSchemaExists(final JdbcDatabase database, final String schemaN
   /**
    * Insert records into table. Assumes the table exists.
    *
-   * @param database   Database that the connector is syncing
-   * @param records    Records to insert.
+   * @param database Database that the connector is syncing
+   * @param records Records to insert.
    * @param schemaName Name of schema
-   * @param tableName  Name of table
+   * @param tableName Name of table
    * @throws Exception exception
    */
   void insertRecords(JdbcDatabase database, List<AirbyteRecordMessage> records, String schemaName, String tableName) throws Exception;
 
   /**
-   * Query to copy all records from source table to destination table. Both tables must be in the specified schema. Assumes both table exist.
+   * Query to copy all records from source table to destination table. Both tables must be in the
+   * specified schema. Assumes both table exist.
    *
-   * @param database             Database that the connector is syncing
-   * @param schemaName           Name of schema
-   * @param sourceTableName      Name of source table
+   * @param database Database that the connector is syncing
+   * @param schemaName Name of schema
+   * @param sourceTableName Name of source table
    * @param destinationTableName Name of destination table
    * @return Query
    */
@@ -103,7 +104,7 @@ default boolean isSchemaExists(final JdbcDatabase database, final String schemaN
    * Given an arbitrary number of queries, execute a transaction.
    *
    * @param database Database that the connector is syncing
-   * @param queries  Queries to execute
+   * @param queries Queries to execute
    * @throws Exception exception
    */
   void executeTransaction(JdbcDatabase database, List<String> queries) throws Exception;
@@ -120,19 +121,21 @@ default boolean isSchemaExists(final JdbcDatabase database, final String schemaN
    */
   boolean isSchemaRequired();
 
-
   /**
-   * The method is responsible for executing some specific DB Engine logic in onClose method. We can override this method to execute specific logic
-   * e.g. to handle any necessary migrations in the destination, etc.
+   * The method is responsible for executing some specific DB Engine logic in onClose method. We can
+   * override this method to execute specific logic e.g. to handle any necessary migrations in the
+   * destination, etc.
    * <p>
-   * In next example you can see how migration from VARCHAR to SUPER column is handled for the Redshift destination:
+   * In next example you can see how migration from VARCHAR to SUPER column is handled for the
+   * Redshift destination:
    *
    * @param database - Database that the connector is interacting with
-   * @param schemaNames   - schemas will be discovered
+   * @param schemaNames - schemas will be discovered
    * @see io.airbyte.integrations.destination.redshift.RedshiftSqlOperations#onDestinationCloseOperations
    */
   default void onDestinationCloseOperations(JdbcDatabase database, Set<String> schemaNames) {
     // do nothing
     LOGGER.info("No onDestinationCloseOperations required for this destination.");
   }
+
 }
diff --git a/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/copy/CopyConsumerFactory.java b/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/copy/CopyConsumerFactory.java
index 9970402d67870f..2fb4d0b3bf3df1 100644
--- a/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/copy/CopyConsumerFactory.java
+++ b/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/copy/CopyConsumerFactory.java
@@ -35,13 +35,13 @@ public class CopyConsumerFactory {
   private static final Logger LOGGER = LoggerFactory.getLogger(CopyConsumerFactory.class);
 
   public static <T> AirbyteMessageConsumer create(final Consumer<AirbyteMessage> outputRecordCollector,
-      final JdbcDatabase database,
-      final SqlOperations sqlOperations,
-      final ExtendedNameTransformer namingResolver,
-      final T config,
-      final ConfiguredAirbyteCatalog catalog,
-      final StreamCopierFactory<T> streamCopierFactory,
-      final String defaultSchema) {
+                                                  final JdbcDatabase database,
+                                                  final SqlOperations sqlOperations,
+                                                  final ExtendedNameTransformer namingResolver,
+                                                  final T config,
+                                                  final ConfiguredAirbyteCatalog catalog,
+                                                  final StreamCopierFactory<T> streamCopierFactory,
+                                                  final String defaultSchema) {
     final Map<AirbyteStreamNameNamespacePair, StreamCopier> pairToCopier = createWriteConfigs(
         namingResolver,
         config,
@@ -65,12 +65,12 @@ public static <T> AirbyteMessageConsumer create(final Consumer<AirbyteMessage> o
   }
 
   private static <T> Map<AirbyteStreamNameNamespacePair, StreamCopier> createWriteConfigs(final ExtendedNameTransformer namingResolver,
-      final T config,
-      final ConfiguredAirbyteCatalog catalog,
-      final StreamCopierFactory<T> streamCopierFactory,
-      final String defaultSchema,
-      final JdbcDatabase database,
-      final SqlOperations sqlOperations) {
+                                                                                          final T config,
+                                                                                          final ConfiguredAirbyteCatalog catalog,
+                                                                                          final StreamCopierFactory<T> streamCopierFactory,
+                                                                                          final String defaultSchema,
+                                                                                          final JdbcDatabase database,
+                                                                                          final SqlOperations sqlOperations) {
     final Map<AirbyteStreamNameNamespacePair, StreamCopier> pairToCopier = new HashMap<>();
     final String stagingFolder = UUID.randomUUID().toString();
     for (final var configuredStream : catalog.getStreams()) {
@@ -89,8 +89,8 @@ private static OnStartFunction onStartFunction(final Map<AirbyteStreamNameNamesp
   }
 
   private static RecordWriter<AirbyteRecordMessage> recordWriterFunction(final Map<AirbyteStreamNameNamespacePair, StreamCopier> pairToCopier,
-      final SqlOperations sqlOperations,
-      final Map<AirbyteStreamNameNamespacePair, Long> pairToIgnoredRecordCount) {
+                                                                         final SqlOperations sqlOperations,
+                                                                         final Map<AirbyteStreamNameNamespacePair, Long> pairToIgnoredRecordCount) {
     return (AirbyteStreamNameNamespacePair pair, List<AirbyteRecordMessage> records) -> {
       final var fileName = pairToCopier.get(pair).prepareStagingFile();
       for (final AirbyteRecordMessage recordMessage : records) {
@@ -117,9 +117,9 @@ private static CheckAndRemoveRecordWriter removeStagingFilePrinter(final Map<Air
   }
 
   private static OnCloseFunction onCloseFunction(final Map<AirbyteStreamNameNamespacePair, StreamCopier> pairToCopier,
-      final JdbcDatabase database,
-      final SqlOperations sqlOperations,
-      final Map<AirbyteStreamNameNamespacePair, Long> pairToIgnoredRecordCount) {
+                                                 final JdbcDatabase database,
+                                                 final SqlOperations sqlOperations,
+                                                 final Map<AirbyteStreamNameNamespacePair, Long> pairToIgnoredRecordCount) {
     return (hasFailed) -> {
       pairToIgnoredRecordCount
           .forEach((pair, count) -> LOGGER.warn("A total of {} record(s) of data from stream {} were invalid and were ignored.", count, pair));
@@ -128,9 +128,9 @@ private static OnCloseFunction onCloseFunction(final Map<AirbyteStreamNameNamesp
   }
 
   private static void closeAsOneTransaction(final Map<AirbyteStreamNameNamespacePair, StreamCopier> pairToCopier,
-      boolean hasFailed,
-      final JdbcDatabase db,
-      final SqlOperations sqlOperations)
+                                            boolean hasFailed,
+                                            final JdbcDatabase db,
+                                            final SqlOperations sqlOperations)
       throws Exception {
     Exception firstException = null;
     List<StreamCopier> streamCopiers = new ArrayList<>(pairToCopier.values());
diff --git a/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/copy/StreamCopier.java b/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/copy/StreamCopier.java
index 93eb78cadafc28..d655bea2f147e9 100644
--- a/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/copy/StreamCopier.java
+++ b/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/jdbc/copy/StreamCopier.java
@@ -77,4 +77,5 @@ public interface StreamCopier {
    * @return current staging file name
    */
   String getCurrentFile();
+
 }
diff --git a/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/staging/StagingOperations.java b/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/staging/StagingOperations.java
index 5af382004d7536..e2a1b799e48ca9 100644
--- a/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/staging/StagingOperations.java
+++ b/airbyte-integrations/connectors/destination-jdbc/src/main/java/io/airbyte/integrations/destination/staging/StagingOperations.java
@@ -11,7 +11,7 @@
 import java.util.UUID;
 import org.joda.time.DateTime;
 
-public interface StagingOperations extends SqlOperations  {
+public interface StagingOperations extends SqlOperations {
 
   String getStageName(String namespace, String streamName);
 
diff --git a/airbyte-integrations/connectors/destination-local-json/src/test-integration/java/io/airbyte/integrations/destination/local_json/LocalJsonDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-local-json/src/test-integration/java/io/airbyte/integrations/destination/local_json/LocalJsonDestinationAcceptanceTest.java
index aa17f0a82513cc..63e7dd55d6c686 100644
--- a/airbyte-integrations/connectors/destination-local-json/src/test-integration/java/io/airbyte/integrations/destination/local_json/LocalJsonDestinationAcceptanceTest.java
+++ b/airbyte-integrations/connectors/destination-local-json/src/test-integration/java/io/airbyte/integrations/destination/local_json/LocalJsonDestinationAcceptanceTest.java
@@ -14,7 +14,6 @@
 import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest;
 import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator;
 import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
-
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
diff --git a/airbyte-integrations/connectors/destination-mariadb-columnstore/src/test-integration/java/io/airbyte/integrations/destination/mariadb_columnstore/MariaDbTestDataComparator.java b/airbyte-integrations/connectors/destination-mariadb-columnstore/src/test-integration/java/io/airbyte/integrations/destination/mariadb_columnstore/MariaDbTestDataComparator.java
index 45b6f093f5f94b..d10d4349dc23e7 100644
--- a/airbyte-integrations/connectors/destination-mariadb-columnstore/src/test-integration/java/io/airbyte/integrations/destination/mariadb_columnstore/MariaDbTestDataComparator.java
+++ b/airbyte-integrations/connectors/destination-mariadb-columnstore/src/test-integration/java/io/airbyte/integrations/destination/mariadb_columnstore/MariaDbTestDataComparator.java
@@ -1,22 +1,26 @@
+/*
+ * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ */
+
 package io.airbyte.integrations.destination.mariadb_columnstore;
 
 import io.airbyte.integrations.destination.ExtendedNameTransformer;
 import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator;
-
 import java.util.ArrayList;
 import java.util.List;
 
 public class MariaDbTestDataComparator extends AdvancedTestDataComparator {
 
-    private final ExtendedNameTransformer namingResolver = new MariadbColumnstoreNameTransformer();
+  private final ExtendedNameTransformer namingResolver = new MariadbColumnstoreNameTransformer();
+
+  @Override
+  protected List<String> resolveIdentifier(final String identifier) {
+    final List<String> result = new ArrayList<>();
+    final String resolved = namingResolver.getIdentifier(identifier);
+    result.add(identifier);
+    result.add(resolved);
 
-    @Override
-    protected List<String> resolveIdentifier(final String identifier) {
-        final List<String> result = new ArrayList<>();
-        final String resolved = namingResolver.getIdentifier(identifier);
-        result.add(identifier);
-        result.add(resolved);
+    return result;
+  }
 
-        return result;
-    }
 }
diff --git a/airbyte-integrations/connectors/destination-mariadb-columnstore/src/test-integration/java/io/airbyte/integrations/destination/mariadb_columnstore/MariadbColumnstoreDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-mariadb-columnstore/src/test-integration/java/io/airbyte/integrations/destination/mariadb_columnstore/MariadbColumnstoreDestinationAcceptanceTest.java
index 442e684de020cb..8098ab53ae4564 100644
--- a/airbyte-integrations/connectors/destination-mariadb-columnstore/src/test-integration/java/io/airbyte/integrations/destination/mariadb_columnstore/MariadbColumnstoreDestinationAcceptanceTest.java
+++ b/airbyte-integrations/connectors/destination-mariadb-columnstore/src/test-integration/java/io/airbyte/integrations/destination/mariadb_columnstore/MariadbColumnstoreDestinationAcceptanceTest.java
@@ -13,13 +13,10 @@
 import io.airbyte.integrations.base.JavaBaseConstants;
 import io.airbyte.integrations.destination.ExtendedNameTransformer;
 import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest;
+import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
 import java.sql.SQLException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
-
-import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator;
-import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.MariaDBContainer;
diff --git a/airbyte-integrations/connectors/destination-meilisearch/src/test-integration/java/io/airbyte/integrations/destination/meilisearch/MeiliSearchDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-meilisearch/src/test-integration/java/io/airbyte/integrations/destination/meilisearch/MeiliSearchDestinationAcceptanceTest.java
index 66cd9a83e29bf5..bd94430bebdb1d 100644
--- a/airbyte-integrations/connectors/destination-meilisearch/src/test-integration/java/io/airbyte/integrations/destination/meilisearch/MeiliSearchDestinationAcceptanceTest.java
+++ b/airbyte-integrations/connectors/destination-meilisearch/src/test-integration/java/io/airbyte/integrations/destination/meilisearch/MeiliSearchDestinationAcceptanceTest.java
@@ -14,15 +14,14 @@
 import io.airbyte.commons.stream.MoreStreams;
 import io.airbyte.commons.text.Names;
 import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest;
+import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator;
+import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
-
-import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator;
-import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.utility.DockerImageName;
 
diff --git a/airbyte-integrations/connectors/destination-mongodb/src/test-integration/java/io/airbyte/integrations/destination/mongodb/MongodbDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-mongodb/src/test-integration/java/io/airbyte/integrations/destination/mongodb/MongodbDestinationAcceptanceTest.java
index ac93c4e54a5df5..a04fdd273ec6fc 100644
--- a/airbyte-integrations/connectors/destination-mongodb/src/test-integration/java/io/airbyte/integrations/destination/mongodb/MongodbDestinationAcceptanceTest.java
+++ b/airbyte-integrations/connectors/destination-mongodb/src/test-integration/java/io/airbyte/integrations/destination/mongodb/MongodbDestinationAcceptanceTest.java
@@ -12,11 +12,10 @@
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.db.mongodb.MongoDatabase;
 import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest;
-import java.util.ArrayList;
-import java.util.List;
-
 import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator;
 import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
+import java.util.ArrayList;
+import java.util.List;
 import org.bson.Document;
 import org.testcontainers.containers.MongoDBContainer;
 
diff --git a/airbyte-integrations/connectors/destination-mqtt/src/test-integration/java/io/airbyte/integrations/destination/mqtt/MqttDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-mqtt/src/test-integration/java/io/airbyte/integrations/destination/mqtt/MqttDestinationAcceptanceTest.java
index 8e216112d4622b..d4f9b381187c86 100644
--- a/airbyte-integrations/connectors/destination-mqtt/src/test-integration/java/io/airbyte/integrations/destination/mqtt/MqttDestinationAcceptanceTest.java
+++ b/airbyte-integrations/connectors/destination-mqtt/src/test-integration/java/io/airbyte/integrations/destination/mqtt/MqttDestinationAcceptanceTest.java
@@ -13,6 +13,8 @@
 import com.hivemq.testcontainer.junit5.HiveMQTestContainerExtension;
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest;
+import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator;
+import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.net.SocketException;
@@ -23,9 +25,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-
-import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator;
-import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
 import org.eclipse.paho.client.mqttv3.MqttClient;
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
 import org.eclipse.paho.client.mqttv3.MqttException;
diff --git a/airbyte-integrations/connectors/destination-oracle/src/main/java/io/airbyte/integrations/destination/oracle/OracleOperations.java b/airbyte-integrations/connectors/destination-oracle/src/main/java/io/airbyte/integrations/destination/oracle/OracleOperations.java
index b32cf07cbb4568..a133dfb5285f34 100644
--- a/airbyte-integrations/connectors/destination-oracle/src/main/java/io/airbyte/integrations/destination/oracle/OracleOperations.java
+++ b/airbyte-integrations/connectors/destination-oracle/src/main/java/io/airbyte/integrations/destination/oracle/OracleOperations.java
@@ -94,9 +94,9 @@ public String truncateTableQuery(final JdbcDatabase database, final String schem
 
   @Override
   public void insertRecords(final JdbcDatabase database,
-      final List<AirbyteRecordMessage> records,
-      final String schemaName,
-      final String tempTableName)
+                            final List<AirbyteRecordMessage> records,
+                            final String schemaName,
+                            final String tempTableName)
       throws Exception {
     final String tableName = String.format("%s.%s", schemaName, tempTableName);
     final String columns = String.format("(%s, %s, %s)",
@@ -107,11 +107,11 @@ public void insertRecords(final JdbcDatabase database,
 
   // Adapted from SqlUtils.insertRawRecordsInSingleQuery to meet some needs specific to Oracle syntax
   private static void insertRawRecordsInSingleQuery(final String tableName,
-      final String columns,
-      final String recordQueryComponent,
-      final JdbcDatabase jdbcDatabase,
-      final List<AirbyteRecordMessage> records,
-      final Supplier<UUID> uuidSupplier)
+                                                    final String columns,
+                                                    final String recordQueryComponent,
+                                                    final JdbcDatabase jdbcDatabase,
+                                                    final List<AirbyteRecordMessage> records,
+                                                    final Supplier<UUID> uuidSupplier)
       throws SQLException {
     if (records.isEmpty()) {
       return;
@@ -152,9 +152,9 @@ private static void insertRawRecordsInSingleQuery(final String tableName,
 
   @Override
   public String copyTableQuery(final JdbcDatabase database,
-      final String schemaName,
-      final String sourceTableName,
-      final String destinationTableName) {
+                               final String schemaName,
+                               final String sourceTableName,
+                               final String destinationTableName) {
     return String.format("INSERT INTO %s.%s SELECT * FROM %s.%s\n", schemaName, destinationTableName, schemaName, sourceTableName);
   }
 
diff --git a/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/OracleTestDataComparator.java b/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/OracleTestDataComparator.java
index 5be791e75410a4..0ddb650fe2c6db 100644
--- a/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/OracleTestDataComparator.java
+++ b/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/OracleTestDataComparator.java
@@ -1,25 +1,29 @@
+/*
+ * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ */
+
 package io.airbyte.integrations.destination.oracle;
 
 import io.airbyte.integrations.destination.ExtendedNameTransformer;
 import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator;
-
 import java.util.ArrayList;
 import java.util.List;
 
 public class OracleTestDataComparator extends AdvancedTestDataComparator {
 
-    private final ExtendedNameTransformer namingResolver = new OracleNameTransformer();
+  private final ExtendedNameTransformer namingResolver = new OracleNameTransformer();
 
-    @Override
-    protected List<String> resolveIdentifier(final String identifier) {
-        final List<String> result = new ArrayList<>();
-        final String resolved = namingResolver.getIdentifier(identifier);
-        result.add(identifier);
-        result.add(resolved);
-        if (!resolved.startsWith("\"")) {
-            result.add(resolved.toLowerCase());
-            result.add(resolved.toUpperCase());
-        }
-        return result;
+  @Override
+  protected List<String> resolveIdentifier(final String identifier) {
+    final List<String> result = new ArrayList<>();
+    final String resolved = namingResolver.getIdentifier(identifier);
+    result.add(identifier);
+    result.add(resolved);
+    if (!resolved.startsWith("\"")) {
+      result.add(resolved.toLowerCase());
+      result.add(resolved.toUpperCase());
     }
+    return result;
+  }
+
 }
diff --git a/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/SshOracleDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/SshOracleDestinationAcceptanceTest.java
index ee48ebcbcc7481..133a44263c2511 100644
--- a/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/SshOracleDestinationAcceptanceTest.java
+++ b/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/SshOracleDestinationAcceptanceTest.java
@@ -17,13 +17,11 @@
 import io.airbyte.integrations.base.ssh.SshTunnel;
 import io.airbyte.integrations.destination.ExtendedNameTransformer;
 import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest;
+import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
-
-import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
 import org.testcontainers.containers.Network;
 
 public abstract class SshOracleDestinationAcceptanceTest extends DestinationAcceptanceTest {
diff --git a/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/UnencryptedOracleDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/UnencryptedOracleDestinationAcceptanceTest.java
index fd404bee795564..1342c57dafd375 100644
--- a/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/UnencryptedOracleDestinationAcceptanceTest.java
+++ b/airbyte-integrations/connectors/destination-oracle/src/test-integration/java/io/airbyte/integrations/destination/oracle/UnencryptedOracleDestinationAcceptanceTest.java
@@ -17,13 +17,10 @@
 import io.airbyte.db.jdbc.JdbcUtils;
 import io.airbyte.integrations.destination.ExtendedNameTransformer;
 import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest;
+import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
 import java.sql.SQLException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
-
-import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator;
-import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
 import org.junit.Test;
 
 public class UnencryptedOracleDestinationAcceptanceTest extends DestinationAcceptanceTest {
diff --git a/airbyte-integrations/connectors/destination-postgres-strict-encrypt/Dockerfile b/airbyte-integrations/connectors/destination-postgres-strict-encrypt/Dockerfile
index 1c32dea0e209b0..0c472d5343f89d 100644
--- a/airbyte-integrations/connectors/destination-postgres-strict-encrypt/Dockerfile
+++ b/airbyte-integrations/connectors/destination-postgres-strict-encrypt/Dockerfile
@@ -16,5 +16,5 @@ ENV APPLICATION destination-postgres-strict-encrypt
 
 COPY --from=build /airbyte /airbyte
 
-LABEL io.airbyte.version=0.1.4
+LABEL io.airbyte.version=0.1.5
 LABEL io.airbyte.name=airbyte/destination-postgres-strict-encrypt
diff --git a/airbyte-integrations/connectors/destination-postgres-strict-encrypt/src/test/resources/expected_spec.json b/airbyte-integrations/connectors/destination-postgres-strict-encrypt/src/test/resources/expected_spec.json
index 10e1c1251a4402..8ba1678fcb554a 100644
--- a/airbyte-integrations/connectors/destination-postgres-strict-encrypt/src/test/resources/expected_spec.json
+++ b/airbyte-integrations/connectors/destination-postgres-strict-encrypt/src/test/resources/expected_spec.json
@@ -54,6 +54,12 @@
         "airbyte_secret": true,
         "order": 5
       },
+      "jdbc_url_params": {
+        "description": "Additional properties to pass to the JDBC URL string when connecting to the database formatted as 'key=value' pairs separated by the symbol '&'. (example: key1=value1&key2=value2&key3=value3).",
+        "title": "JDBC URL Params",
+        "type": "string",
+        "order": 7
+      },
       "tunnel_method": {
         "type": "object",
         "title": "SSH Tunnel Method",
diff --git a/airbyte-integrations/connectors/destination-pubsub/src/test-integration/java/io/airbyte/integrations/destination/pubsub/PubsubDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-pubsub/src/test-integration/java/io/airbyte/integrations/destination/pubsub/PubsubDestinationAcceptanceTest.java
index a85de5db194522..aaadb701bd9fbe 100644
--- a/airbyte-integrations/connectors/destination-pubsub/src/test-integration/java/io/airbyte/integrations/destination/pubsub/PubsubDestinationAcceptanceTest.java
+++ b/airbyte-integrations/connectors/destination-pubsub/src/test-integration/java/io/airbyte/integrations/destination/pubsub/PubsubDestinationAcceptanceTest.java
@@ -38,6 +38,8 @@
 import io.airbyte.integrations.base.AirbyteStreamNameNamespacePair;
 import io.airbyte.integrations.base.JavaBaseConstants;
 import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest;
+import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator;
+import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -91,6 +93,26 @@ private AirbyteStreamNameNamespacePair fromJsonNode(final JsonNode j) {
     return new AirbyteStreamNameNamespacePair(stream, namespace);
   }
 
+  @Override
+  protected TestDataComparator getTestDataComparator() {
+    return new AdvancedTestDataComparator();
+  }
+
+  @Override
+  protected boolean supportBasicDataTypeTest() {
+    return true;
+  }
+
+  @Override
+  protected boolean supportArrayDataTypeTest() {
+    return true;
+  }
+
+  @Override
+  protected boolean supportObjectDataTypeTest() {
+    return true;
+  }
+
   @Override
   protected List<JsonNode> retrieveRecords(final TestDestinationEnv testEnv,
                                            final String streamName,
diff --git a/airbyte-integrations/connectors/destination-pulsar/src/main/java/io/airbyte/integrations/destination/pulsar/PulsarRecordConsumer.java b/airbyte-integrations/connectors/destination-pulsar/src/main/java/io/airbyte/integrations/destination/pulsar/PulsarRecordConsumer.java
index c22ac5c056c5bc..129b9e86348cb5 100644
--- a/airbyte-integrations/connectors/destination-pulsar/src/main/java/io/airbyte/integrations/destination/pulsar/PulsarRecordConsumer.java
+++ b/airbyte-integrations/connectors/destination-pulsar/src/main/java/io/airbyte/integrations/destination/pulsar/PulsarRecordConsumer.java
@@ -11,6 +11,7 @@
 import io.airbyte.protocol.models.AirbyteMessage;
 import io.airbyte.protocol.models.AirbyteRecordMessage;
 import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -69,7 +70,7 @@ protected void acceptTracked(final AirbyteMessage airbyteMessage) {
           .set(PulsarDestination.COLUMN_NAME_AB_ID, key)
           .set(PulsarDestination.COLUMN_NAME_STREAM, recordMessage.getStream())
           .set(PulsarDestination.COLUMN_NAME_EMITTED_AT, recordMessage.getEmittedAt())
-          .set(PulsarDestination.COLUMN_NAME_DATA, recordMessage.getData().toString().getBytes())
+          .set(PulsarDestination.COLUMN_NAME_DATA, recordMessage.getData().toString().getBytes(StandardCharsets.UTF_8))
           .build();
 
       sendRecord(producer, value);
diff --git a/airbyte-integrations/connectors/destination-pulsar/src/test-integration/java/io/airbyte/integrations/destination/pulsar/PulsarDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-pulsar/src/test-integration/java/io/airbyte/integrations/destination/pulsar/PulsarDestinationAcceptanceTest.java
index 26dae59de485cb..f31ec96dbfa61a 100644
--- a/airbyte-integrations/connectors/destination-pulsar/src/test-integration/java/io/airbyte/integrations/destination/pulsar/PulsarDestinationAcceptanceTest.java
+++ b/airbyte-integrations/connectors/destination-pulsar/src/test-integration/java/io/airbyte/integrations/destination/pulsar/PulsarDestinationAcceptanceTest.java
@@ -15,6 +15,8 @@
 import io.airbyte.integrations.destination.NamingConventionTransformer;
 import io.airbyte.integrations.destination.StandardNameTransformer;
 import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest;
+import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator;
+import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
@@ -103,6 +105,26 @@ protected String getDefaultSchema(final JsonNode config) {
     return "";
   }
 
+  @Override
+  protected TestDataComparator getTestDataComparator() {
+    return new AdvancedTestDataComparator();
+  }
+
+  @Override
+  protected boolean supportBasicDataTypeTest() {
+    return true;
+  }
+
+  @Override
+  protected boolean supportArrayDataTypeTest() {
+    return true;
+  }
+
+  @Override
+  protected boolean supportObjectDataTypeTest() {
+    return true;
+  }
+
   @Override
   protected List<JsonNode> retrieveNormalizedRecords(final TestDestinationEnv testEnv, final String streamName, final String namespace)
       throws IOException {
diff --git a/airbyte-integrations/connectors/destination-redis/src/test-integration/java/io/airbyte/integrations/destination/redis/RedisDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-redis/src/test-integration/java/io/airbyte/integrations/destination/redis/RedisDestinationAcceptanceTest.java
index ca80552dc3cb64..9dcc2312e2fcc8 100644
--- a/airbyte-integrations/connectors/destination-redis/src/test-integration/java/io/airbyte/integrations/destination/redis/RedisDestinationAcceptanceTest.java
+++ b/airbyte-integrations/connectors/destination-redis/src/test-integration/java/io/airbyte/integrations/destination/redis/RedisDestinationAcceptanceTest.java
@@ -7,6 +7,8 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest;
+import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator;
+import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -68,6 +70,26 @@ protected boolean implementsNamespaces() {
     return true;
   }
 
+  @Override
+  protected TestDataComparator getTestDataComparator() {
+    return new AdvancedTestDataComparator();
+  }
+
+  @Override
+  protected boolean supportBasicDataTypeTest() {
+    return true;
+  }
+
+  @Override
+  protected boolean supportArrayDataTypeTest() {
+    return true;
+  }
+
+  @Override
+  protected boolean supportObjectDataTypeTest() {
+    return true;
+  }
+
   @Override
   protected List<JsonNode> retrieveRecords(TestDestinationEnv testEnv,
                                            String streamName,
diff --git a/airbyte-integrations/connectors/destination-redshift/src/main/resources/spec.json b/airbyte-integrations/connectors/destination-redshift/src/main/resources/spec.json
index 360372f2ca8956..243259955ddf86 100644
--- a/airbyte-integrations/connectors/destination-redshift/src/main/resources/spec.json
+++ b/airbyte-integrations/connectors/destination-redshift/src/main/resources/spec.json
@@ -49,22 +49,22 @@
         "title": "Default Schema"
       },
       "s3_bucket_name": {
-        "title": "S3 Bucket Name",
+        "title": "S3 Bucket Name (Optional)",
         "type": "string",
-        "description": "The name of the staging S3 bucket to use if utilising a COPY strategy. COPY is recommended for production workloads for better speed and scalability. See <a href=\"https://docs.aws.amazon.com/redshift/latest/dg/c_loading-data-best-practices.html\">AWS docs</a> for more details.",
+        "description": "The name of the staging S3 bucket to use if utilising a COPY strategy. COPY is recommended for production workloads for better speed and scalability. See <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/userguide/creating-bucket.html\">AWS docs</a> for more details.",
         "examples": ["airbyte.staging"]
       },
       "s3_bucket_path": {
-        "title": "S3 Bucket Path",
+        "title": "S3 Bucket Path (Optional)",
         "type": "string",
-        "description": "The directory under the S3 bucket where data will be written. If not provided, then defaults to the root directory.",
+        "description": "The directory under the S3 bucket where data will be written. If not provided, then defaults to the root directory. See <a href=\"https://docs.aws.amazon.com/prescriptive-guidance/latest/defining-bucket-names-data-lakes/faq.html#:~:text=be%20globally%20unique.-,For%20S3%20bucket%20paths,-%2C%20you%20can%20use\">path's name recommendations</a> for more details.",
         "examples": ["data_sync/test"]
       },
       "s3_bucket_region": {
-        "title": "S3 Bucket Region",
+        "title": "S3 Bucket Region (Optional)",
         "type": "string",
         "default": "",
-        "description": "The region of the S3 staging bucket to use if utilising a copy strategy.",
+        "description": "The region of the S3 staging bucket to use if utilising a COPY strategy. See <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/userguide/creating-bucket.html#:~:text=In-,Region,-%2C%20choose%20the%20AWS\">AWS docs</a> for details.",
         "enum": [
           "",
           "us-east-1",
@@ -94,14 +94,14 @@
       },
       "access_key_id": {
         "type": "string",
-        "description": "The Access Key Id granting allow one to access the above S3 staging bucket. Airbyte requires Read and Write permissions to the given bucket.",
-        "title": "S3 Key Id",
+        "description": "This ID grants access to the above S3 staging bucket. Airbyte requires Read and Write permissions to the given bucket. See <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-sec-cred-types.html#access-keys-and-secret-access-keys\">AWS docs</a> on how to generate an access key ID and secret access key.",
+        "title": "S3 Key Id (Optional)",
         "airbyte_secret": true
       },
       "secret_access_key": {
         "type": "string",
-        "description": "The corresponding secret to the above access key id.",
-        "title": "S3 Access Key",
+        "description": "The corresponding secret to the above access key id. See <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-sec-cred-types.html#access-keys-and-secret-access-keys\">AWS docs</a> on how to generate an access key ID and secret access key.",
+        "title": "S3 Access Key (Optional)",
         "airbyte_secret": true
       },
       "part_size": {
@@ -109,13 +109,13 @@
         "minimum": 10,
         "maximum": 100,
         "examples": ["10"],
-        "description": "Optional. Increase this if syncing tables larger than 100GB. Only relevant for COPY. Files are streamed to S3 in parts. This determines the size of each part, in MBs. As S3 has a limit of 10,000 parts per file, part size affects the table size. This is 10MB by default, resulting in a default limit of 100GB tables. Note, a larger part size will result in larger memory requirements. A rule of thumb is to multiply the part size by 10 to get the memory requirement. Modify this with care.",
-        "title": "Stream Part Size"
+        "description": "Increase this if syncing tables larger than 100GB. Only relevant for COPY. Files are streamed to S3 in parts. This determines the size of each part, in MBs. As S3 has a limit of 10,000 parts per file, part size affects the table size. This is 10MB by default, resulting in a default limit of 100GB tables. Note: a larger part size will result in larger memory requirements. A rule of thumb is to multiply the part size by 10 to get the memory requirement. Modify this with care. See <a href=\"https://docs.airbyte.com/integrations/destinations/redshift/#:~:text=above%20key%20id.-,Part%20Size,-Affects%20the%20size\",> docs</a> for details.",
+        "title": "Stream Part Size (Optional)"
       },
       "purge_staging_data": {
-        "title": "Purge Staging Files and Tables",
+        "title": "Purge Staging Files and Tables (Optional)",
         "type": "boolean",
-        "description": "Whether to delete the staging files from S3 after completing the sync. See the docs for details. Only relevant for COPY. Defaults to true.",
+        "description": "Whether to delete the staging files from S3 after completing the sync. See <a href=\"https://docs.airbyte.com/integrations/destinations/redshift/#:~:text=the%20root%20directory.-,Purge%20Staging%20Data,-Whether%20to%20delete\"> docs</a> for details.",
         "default": true
       }
     }
diff --git a/airbyte-integrations/connectors/destination-redshift/src/test-integration/java/io/airbyte/integrations/destination/redshift/RedshiftCopyDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-redshift/src/test-integration/java/io/airbyte/integrations/destination/redshift/RedshiftCopyDestinationAcceptanceTest.java
index f0e729a1ca5ee5..231252bb6b1a76 100644
--- a/airbyte-integrations/connectors/destination-redshift/src/test-integration/java/io/airbyte/integrations/destination/redshift/RedshiftCopyDestinationAcceptanceTest.java
+++ b/airbyte-integrations/connectors/destination-redshift/src/test-integration/java/io/airbyte/integrations/destination/redshift/RedshiftCopyDestinationAcceptanceTest.java
@@ -5,20 +5,24 @@
 package io.airbyte.integrations.destination.redshift;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.airbyte.commons.io.IOs;
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.commons.string.Strings;
 import io.airbyte.db.Database;
 import io.airbyte.db.Databases;
-import io.airbyte.db.jdbc.JdbcUtils;
 import io.airbyte.integrations.base.JavaBaseConstants;
 import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest;
+import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
 import java.nio.file.Path;
 import java.sql.SQLException;
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
+import org.jooq.Record;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Integration test testing {@link RedshiftCopyS3Destination}. The default Redshift integration test
@@ -26,6 +30,8 @@
  */
 public class RedshiftCopyDestinationAcceptanceTest extends DestinationAcceptanceTest {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(RedshiftCopyDestinationAcceptanceTest.class);
+
   // config from which to create / delete schemas.
   private JsonNode baseConfig;
   // config which refers to the schema that the test is being run in.
@@ -34,6 +40,8 @@ public class RedshiftCopyDestinationAcceptanceTest extends DestinationAcceptance
 
   protected TestDestinationEnv testDestinationEnv;
 
+  private final ObjectMapper mapper = new ObjectMapper();
+
   @Override
   protected String getImageName() {
     return "airbyte/destination-redshift:dev";
@@ -55,6 +63,26 @@ protected JsonNode getFailCheckConfig() {
     return invalidConfig;
   }
 
+  @Override
+  protected TestDataComparator getTestDataComparator() {
+    return new RedshiftTestDataComparator();
+  }
+
+  @Override
+  protected boolean supportBasicDataTypeTest() {
+    return true;
+  }
+
+  @Override
+  protected boolean supportArrayDataTypeTest() {
+    return true;
+  }
+
+  @Override
+  protected boolean supportObjectDataTypeTest() {
+    return true;
+  }
+
   @Override
   protected List<JsonNode> retrieveRecords(final TestDestinationEnv env,
                                            final String streamName,
@@ -63,7 +91,7 @@ protected List<JsonNode> retrieveRecords(final TestDestinationEnv env,
       throws Exception {
     return retrieveRecordsFromTable(namingResolver.getRawTableName(streamName), namespace)
         .stream()
-        .map(j -> Jsons.deserialize(j.get(JavaBaseConstants.COLUMN_NAME_DATA).asText()))
+        .map(j -> j.get(JavaBaseConstants.COLUMN_NAME_DATA))
         .collect(Collectors.toList());
   }
 
@@ -93,17 +121,27 @@ protected List<JsonNode> retrieveNormalizedRecords(final TestDestinationEnv test
     return retrieveRecordsFromTable(tableName, namespace);
   }
 
-  @Override
-  protected List<String> resolveIdentifier(final String identifier) {
-    final List<String> result = new ArrayList<>();
-    final String resolved = namingResolver.getIdentifier(identifier);
-    result.add(identifier);
-    result.add(resolved);
-    if (!resolved.startsWith("\"")) {
-      result.add(resolved.toLowerCase());
-      result.add(resolved.toUpperCase());
-    }
-    return result;
+  private JsonNode getJsonFromRecord(Record record) {
+    ObjectNode node = mapper.createObjectNode();
+
+    Arrays.stream(record.fields()).forEach(field -> {
+      var value = record.get(field);
+
+      switch (field.getDataType().getTypeName()) {
+        case "varchar", "other":
+          var stringValue = (value != null ? value.toString() : null);
+          if (stringValue != null && (stringValue.replaceAll("[^\\x00-\\x7F]", "").matches("^\\[.*\\]$")
+              || stringValue.replaceAll("[^\\x00-\\x7F]", "").matches("^\\{.*\\}$"))) {
+            node.set(field.getName(), Jsons.deserialize(stringValue));
+          } else {
+            node.put(field.getName(), stringValue);
+          }
+          break;
+        default:
+          node.put(field.getName(), (value != null ? value.toString() : null));
+      }
+    });
+    return node;
   }
 
   private List<JsonNode> retrieveRecordsFromTable(final String tableName, final String schemaName) throws SQLException {
@@ -111,8 +149,7 @@ private List<JsonNode> retrieveRecordsFromTable(final String tableName, final St
         ctx -> ctx
             .fetch(String.format("SELECT * FROM %s.%s ORDER BY %s ASC;", schemaName, tableName, JavaBaseConstants.COLUMN_NAME_EMITTED_AT))
             .stream()
-            .map(r -> r.formatJSON(JdbcUtils.getDefaultJSONFormat()))
-            .map(Jsons::deserialize)
+            .map(this::getJsonFromRecord)
             .collect(Collectors.toList()));
   }
 
diff --git a/airbyte-integrations/connectors/destination-redshift/src/test-integration/java/io/airbyte/integrations/destination/redshift/RedshiftTestDataComparator.java b/airbyte-integrations/connectors/destination-redshift/src/test-integration/java/io/airbyte/integrations/destination/redshift/RedshiftTestDataComparator.java
new file mode 100644
index 00000000000000..6b018e9cd7f4e7
--- /dev/null
+++ b/airbyte-integrations/connectors/destination-redshift/src/test-integration/java/io/airbyte/integrations/destination/redshift/RedshiftTestDataComparator.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.integrations.destination.redshift;
+
+import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator;
+import java.time.DateTimeException;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RedshiftTestDataComparator extends AdvancedTestDataComparator {
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(RedshiftTestDataComparator.class);
+
+  private final RedshiftSQLNameTransformer namingResolver = new RedshiftSQLNameTransformer();
+
+  protected static final String REDSHIFT_DATETIME_WITH_TZ_FORMAT = "yyyy-MM-dd HH:mm:ssX";
+
+  @Override
+  protected ZonedDateTime parseDestinationDateWithTz(String destinationValue) {
+    return ZonedDateTime.parse(destinationValue, DateTimeFormatter.ofPattern(REDSHIFT_DATETIME_WITH_TZ_FORMAT)).withZoneSameInstant(ZoneOffset.UTC);
+  }
+
+  @Override
+  protected boolean compareDateTimeValues(String airbyteMessageValue, String destinationValue) {
+    try {
+      var format = DateTimeFormatter.ofPattern(AIRBYTE_DATETIME_FORMAT);
+      LocalDateTime dateTime = LocalDateTime.parse(destinationValue, DateTimeFormatter.ofPattern(REDSHIFT_DATETIME_WITH_TZ_FORMAT));
+      return super.compareDateTimeValues(airbyteMessageValue, format.format(dateTime));
+    } catch (DateTimeException e) {
+      LOGGER.warn("Fail to convert values to DateTime. Try to compare as text. Airbyte value({}), Destination value ({}). Exception: {}",
+          airbyteMessageValue, destinationValue, e);
+      return compareTextValues(airbyteMessageValue, destinationValue);
+    }
+  }
+
+  @Override
+  protected List<String> resolveIdentifier(final String identifier) {
+    final List<String> result = new ArrayList<>();
+    final String resolved = namingResolver.getIdentifier(identifier);
+    result.add(identifier);
+    result.add(resolved);
+    if (!resolved.startsWith("\"")) {
+      result.add(resolved.toLowerCase());
+      result.add(resolved.toUpperCase());
+    }
+    return result;
+  }
+
+}
diff --git a/airbyte-integrations/connectors/destination-rockset/src/test-integration/java/io/airbyte/integrations/destination/rockset/RocksetDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-rockset/src/test-integration/java/io/airbyte/integrations/destination/rockset/RocksetDestinationAcceptanceTest.java
index cfd96d02dffa6b..a0efe58576acc5 100644
--- a/airbyte-integrations/connectors/destination-rockset/src/test-integration/java/io/airbyte/integrations/destination/rockset/RocksetDestinationAcceptanceTest.java
+++ b/airbyte-integrations/connectors/destination-rockset/src/test-integration/java/io/airbyte/integrations/destination/rockset/RocksetDestinationAcceptanceTest.java
@@ -18,6 +18,8 @@
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.commons.lang.Exceptions;
 import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest;
+import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator;
+import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -54,6 +56,26 @@ protected JsonNode getConfig() throws IOException {
     return Jsons.deserialize(IOs.readFile(Path.of("secrets/config.json")));
   }
 
+  @Override
+  protected TestDataComparator getTestDataComparator() {
+    return new AdvancedTestDataComparator();
+  }
+
+  @Override
+  protected boolean supportBasicDataTypeTest() {
+    return true;
+  }
+
+  @Override
+  protected boolean supportArrayDataTypeTest() {
+    return true;
+  }
+
+  @Override
+  protected boolean supportObjectDataTypeTest() {
+    return true;
+  }
+
   @Override
   protected JsonNode getFailCheckConfig() throws Exception {
     return Jsons.jsonNode(
diff --git a/airbyte-integrations/connectors/destination-s3/src/test/resources/parquet/json_schema_converter/json_conversion_test_cases.json b/airbyte-integrations/connectors/destination-s3/src/test/resources/parquet/json_schema_converter/json_conversion_test_cases.json
index 5bd54d969dc265..044d2c6ac66b42 100644
--- a/airbyte-integrations/connectors/destination-s3/src/test/resources/parquet/json_schema_converter/json_conversion_test_cases.json
+++ b/airbyte-integrations/connectors/destination-s3/src/test/resources/parquet/json_schema_converter/json_conversion_test_cases.json
@@ -1605,5 +1605,48 @@
       "node_id": "abc123",
       "_airbyte_additional_properties": null
     }
+  },
+  {
+    "schemaName": "nullable_value",
+    "namespace": "namespace22",
+    "appendAirbyteFields": false,
+    "jsonSchema": {
+      "type": "object",
+      "properties": {
+        "node_id": {
+          "type": ["null", "number"]
+        }
+      }
+    },
+    "jsonObject": {
+      "node_id": null
+    },
+    "avroSchema": {
+      "type": "record",
+      "name": "nullable_value",
+      "namespace": "namespace22",
+      "fields": [
+        {
+          "name": "node_id",
+          "type": ["null", "double"],
+          "default": null
+        },
+        {
+          "name": "_airbyte_additional_properties",
+          "type": [
+            "null",
+            {
+              "type": "map",
+              "values": "string"
+            }
+          ],
+          "default": null
+        }
+      ]
+    },
+    "avroObject": {
+      "node_id": null,
+      "_airbyte_additional_properties": null
+    }
   }
 ]
diff --git a/airbyte-integrations/connectors/source-amazon-ads/Dockerfile b/airbyte-integrations/connectors/source-amazon-ads/Dockerfile
index bb4f4e6cb7b263..c2b37d453265dd 100644
--- a/airbyte-integrations/connectors/source-amazon-ads/Dockerfile
+++ b/airbyte-integrations/connectors/source-amazon-ads/Dockerfile
@@ -12,5 +12,5 @@ RUN pip install .
 ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=0.1.6
+LABEL io.airbyte.version=0.1.7
 LABEL io.airbyte.name=airbyte/source-amazon-ads
diff --git a/airbyte-integrations/connectors/source-amazon-ads/integration_tests/spec.json b/airbyte-integrations/connectors/source-amazon-ads/integration_tests/spec.json
index 18ee31dc98a911..1eb16cca0e35cf 100644
--- a/airbyte-integrations/connectors/source-amazon-ads/integration_tests/spec.json
+++ b/airbyte-integrations/connectors/source-amazon-ads/integration_tests/spec.json
@@ -1,5 +1,5 @@
 {
-  "documentationUrl": "https://docs.airbyte.io/integrations/sources/amazon-ads",
+  "documentationUrl": "https://docs.airbyte.com/integrations/sources/amazon-ads",
   "connectionSpecification": {
     "title": "Amazon Ads Spec",
     "type": "object",
@@ -12,64 +12,64 @@
         "type": "string"
       },
       "client_id": {
-        "title": "Client Id",
-        "description": "Oauth client id <a href=\"https://advertising.amazon.com/API/docs/en-us/setting-up/step-1-create-lwa-app\">How to create your Login with Amazon</a>",
-        "name": "Client ID",
+        "title": "Client ID",
+        "description": "The Client ID of your Amazon Ads developer application.",
+        "order": 1,
         "type": "string"
       },
       "client_secret": {
         "title": "Client Secret",
-        "description": "Oauth client secret <a href=\"https://advertising.amazon.com/API/docs/en-us/setting-up/step-1-create-lwa-app\">How to create your Login with Amazon</a>",
-        "name": "Client secret",
+        "description": "The Client Secret of your Amazon Ads developer application.",
         "airbyte_secret": true,
+        "order": 2,
         "type": "string"
       },
       "refresh_token": {
         "title": "Refresh Token",
-        "description": "Oauth 2.0 refresh_token, <a href=\"https://developer.amazon.com/docs/login-with-amazon/conceptual-overview.html\">read details here</a>",
-        "name": "Oauth refresh token",
+        "description": "Amazon Ads Refresh Token. See the <a href=\"https://docs.airbyte.com/integrations/sources/amazon-ads\">docs</a> for more information on how to obtain this token.",
         "airbyte_secret": true,
-        "type": "string"
-      },
-      "start_date": {
-        "title": "Start Date",
-        "description": "Start date for collectiong reports, should not be more than 60 days in past. In YYYY-MM-DD format",
-        "name": "Start date",
-        "examples": ["2022-10-10", "2022-10-22"],
+        "order": 3,
         "type": "string"
       },
       "region": {
-        "description": "An enumeration.",
+        "title": "Region *",
+        "description": "Region to pull data from (EU/NA/FE/SANDBOX). See <a href=\"https://advertising.amazon.com/API/docs/en-us/info/api-overview#api-endpoints\">docs</a> for more details.",
         "default": "NA",
-        "name": "Region",
-        "title": "AmazonAdsRegion",
         "enum": ["NA", "EU", "FE", "SANDBOX"],
+        "order": 4,
         "type": "string"
       },
-      "profiles": {
-        "title": "Profiles",
-        "description": "profile Ids you want to fetch data for",
-        "name": "Profile Ids",
-        "type": "array",
-        "items": {
-          "type": "integer"
-        }
-      },
       "report_wait_timeout": {
-        "title": "Report Wait Timeout",
+        "title": "Report Wait Timeout *",
         "description": "Timeout duration in minutes for Reports. Eg. 30",
         "default": 30,
-        "name": "Report Wait Timeout",
         "examples": [30, 120],
+        "order": 5,
         "type": "integer"
       },
       "report_generation_max_retries": {
-        "title": "Report Generation Max Retries",
+        "title": "Report Generation Maximum Retries *",
         "description": "Maximum retries Airbyte will attempt for fetching Report Data. Eg. 5",
         "default": 5,
-        "name": "Report Geration Maximum Retries",
         "examples": [5, 10, 15],
+        "order": 6,
         "type": "integer"
+      },
+      "start_date": {
+        "title": "Start Date (Optional)",
+        "description": "The Start date for collecting reports, should not be more than 60 days in the past. In YYYY-MM-DD format",
+        "examples": ["2022-10-10", "2022-10-22"],
+        "order": 7,
+        "type": "string"
+      },
+      "profiles": {
+        "title": "Profile IDs (Optional)",
+        "description": "Profile IDs you want to fetch data for. See <a href=\"https://advertising.amazon.com/API/docs/en-us/concepts/authorization/profiles\">docs</a> for more details.",
+        "order": 8,
+        "type": "array",
+        "items": {
+          "type": "integer"
+        }
       }
     },
     "required": ["client_id", "client_secret", "refresh_token"]
diff --git a/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/source.py b/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/source.py
index 03da13e1790796..1d836efff44720 100644
--- a/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/source.py
+++ b/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/source.py
@@ -93,7 +93,7 @@ def streams(self, config: Mapping[str, Any]) -> List[Stream]:
 
     def spec(self, *args) -> ConnectorSpecification:
         return ConnectorSpecification(
-            documentationUrl="https://docs.airbyte.io/integrations/sources/amazon-ads",
+            documentationUrl="https://docs.airbyte.com/integrations/sources/amazon-ads",
             connectionSpecification=AmazonAdsConfig.schema(),
             advanced_auth=advanced_auth,
         )
diff --git a/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/spec.py b/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/spec.py
index abda177093fa44..7efc1db550dcf8 100644
--- a/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/spec.py
+++ b/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/spec.py
@@ -5,6 +5,7 @@
 from typing import List
 
 from airbyte_cdk.models import AdvancedAuth, AuthFlowType, OAuthConfigSpecification
+from airbyte_cdk.sources.utils.schema_helpers import expand_refs
 from pydantic import BaseModel, Extra, Field
 from source_amazon_ads.constants import AmazonAdsRegion
 
@@ -21,67 +22,71 @@ class Config:
     auth_type: str = Field(default="oauth2.0", const=True, order=0)
 
     client_id: str = Field(
-        name="Client ID",
-        description=(
-            'Oauth client id <a href="https://advertising.amazon.com/API/docs/en-us/setting-up/step-1-create-lwa-app">'
-            "How to create your Login with Amazon</a>"
-        ),
+        title="Client ID",
+        description="The Client ID of your Amazon Ads developer application.",
+        order=1,
     )
+
     client_secret: str = Field(
-        name="Client secret",
-        description=(
-            'Oauth client secret <a href="https://advertising.amazon.com/API/docs/en-us/setting-up/step-1-create-lwa-app">'
-            "How to create your Login with Amazon</a>"
-        ),
+        title="Client Secret",
+        description="The Client Secret of your Amazon Ads developer application.",
         airbyte_secret=True,
+        order=2,
     )
 
     refresh_token: str = Field(
-        name="Oauth refresh token",
-        description=(
-            'Oauth 2.0 refresh_token, <a href="https://developer.amazon.com/docs/login-with-amazon/conceptual-overview.html">'
-            "read details here</a>"
-        ),
+        title="Refresh Token",
+        description='Amazon Ads Refresh Token. See the <a href="https://docs.airbyte.com/integrations/sources/amazon-ads">docs</a> for more information on how to obtain this token.',
         airbyte_secret=True,
+        order=3,
     )
 
-    start_date: str = Field(
-        None,
-        name="Start date",
-        description="Start date for collectiong reports, should not be more than 60 days in past. In YYYY-MM-DD format",
-        examples=["2022-10-10", "2022-10-22"],
-    )
-
-    region: AmazonAdsRegion = Field(name="Region", description="Region to pull data from (EU/NA/FE/SANDBOX)", default=AmazonAdsRegion.NA)
-
-    profiles: List[int] = Field(
-        None,
-        name="Profile Ids",
-        description="profile Ids you want to fetch data for",
+    region: AmazonAdsRegion = Field(
+        title="Region *",
+        description='Region to pull data from (EU/NA/FE/SANDBOX). See <a href="https://advertising.amazon.com/API/docs/en-us/info/api-overview#api-endpoints">docs</a> for more details.',
+        default=AmazonAdsRegion.NA,
+        order=4,
     )
 
     report_wait_timeout: int = Field(
-        name="Report Wait Timeout",
+        title="Report Wait Timeout *",
         description="Timeout duration in minutes for Reports. Eg. 30",
         default=30,
         examples=[30, 120],
+        order=5,
     )
 
     report_generation_max_retries: int = Field(
-        name="Report Geration Maximum Retries",
+        title="Report Generation Maximum Retries *",
         description="Maximum retries Airbyte will attempt for fetching Report Data. Eg. 5",
         default=5,
         examples=[5, 10, 15],
+        order=6,
+    )
+
+    start_date: str = Field(
+        None,
+        title="Start Date (Optional)",
+        description="The Start date for collecting reports, should not be more than 60 days in the past. In YYYY-MM-DD format",
+        examples=["2022-10-10", "2022-10-22"],
+        order=7,
+    )
+
+    profiles: List[int] = Field(
+        None,
+        title="Profile IDs (Optional)",
+        description='Profile IDs you want to fetch data for. See <a href="https://advertising.amazon.com/API/docs/en-us/concepts/authorization/profiles">docs</a> for more details.',
+        order=8,
     )
 
     @classmethod
     def schema(cls, **kwargs):
         schema = super().schema(**kwargs)
+        expand_refs(schema)
         # Transform pydantic generated enum for region
-        definitions = schema.pop("definitions", None)
-        if definitions:
-            schema["properties"]["region"].update(definitions["AmazonAdsRegion"])
-            schema["properties"]["region"].pop("allOf", None)
+        if schema["properties"]["region"].get("allOf"):
+            schema["properties"]["region"] = {**schema["properties"]["region"]["allOf"][0], **schema["properties"]["region"]}
+            schema["properties"]["region"].pop("allOf")
         return schema
 
 
diff --git a/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/streams/report_streams/products_report.py b/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/streams/report_streams/products_report.py
index 136d3d14ce82dc..8da6b2037a9756 100644
--- a/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/streams/report_streams/products_report.py
+++ b/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/streams/report_streams/products_report.py
@@ -266,7 +266,7 @@ def _get_init_report_body(self, report_date: str, record_type: str, profile):
                 metrics_list = copy(metrics_list)
                 metrics_list.remove("sku")
 
-# adId is automatically added to the report by amazon and requesting adId causes an amazon error
+        # adId is automatically added to the report by amazon and requesting adId causes an amazon error
         if "adId" in metrics_list:
             metrics_list.remove("adId")
 
diff --git a/airbyte-integrations/connectors/source-amplitude/Dockerfile b/airbyte-integrations/connectors/source-amplitude/Dockerfile
index 210e952009ec75..f2cad066bbc678 100644
--- a/airbyte-integrations/connectors/source-amplitude/Dockerfile
+++ b/airbyte-integrations/connectors/source-amplitude/Dockerfile
@@ -12,5 +12,5 @@ RUN pip install .
 ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=0.1.4
+LABEL io.airbyte.version=0.1.5
 LABEL io.airbyte.name=airbyte/source-amplitude
diff --git a/airbyte-integrations/connectors/source-amplitude/source_amplitude/api.py b/airbyte-integrations/connectors/source-amplitude/source_amplitude/api.py
index f5e3e68a3f229c..0d2908608a5e35 100644
--- a/airbyte-integrations/connectors/source-amplitude/source_amplitude/api.py
+++ b/airbyte-integrations/connectors/source-amplitude/source_amplitude/api.py
@@ -17,6 +17,8 @@
 from airbyte_cdk.models import SyncMode
 from airbyte_cdk.sources.streams.http import HttpStream
 
+from .errors import HTTP_ERROR_CODES, error_msg_from_status
+
 
 class AmplitudeStream(HttpStream, ABC):
 
@@ -27,8 +29,12 @@ def next_page_token(self, response: requests.Response) -> Optional[Mapping[str,
         return None
 
     def parse_response(self, response: requests.Response, **kwargs) -> Iterable[Mapping]:
-        response_data = response.json()
-        yield from response_data.get(self.name, [])
+        status = response.status_code
+        if status in HTTP_ERROR_CODES.keys():
+            error_msg_from_status(status)
+            yield from []
+        else:
+            yield from response.json().get(self.data_field, [])
 
     def path(self, **kwargs) -> str:
         return f"{self.api_version}/{self.name}"
@@ -37,14 +43,12 @@ def path(self, **kwargs) -> str:
 class Cohorts(AmplitudeStream):
     primary_key = "id"
     api_version = 3
+    data_field = "cohorts"
 
 
 class Annotations(AmplitudeStream):
     primary_key = "id"
-
-    def parse_response(self, response: requests.Response, **kwargs) -> Iterable[Mapping]:
-        response_data = response.json()
-        yield from response_data.get("data", [])
+    data_field = "data"
 
 
 class IncrementalAmplitudeStream(AmplitudeStream, ABC):
@@ -124,6 +128,22 @@ def _parse_zip_file(self, zip_file: IO[bytes]) -> Iterable[Mapping]:
             for record in file:
                 yield json.loads(record)
 
+    def stream_slices(self, stream_state: Mapping[str, Any] = None, **kwargs) -> Iterable[Optional[Mapping[str, Any]]]:
+        slices = []
+        start = self._start_date
+        if stream_state:
+            start = pendulum.parse(stream_state.get(self.cursor_field))
+        end = pendulum.now()
+        while start <= end:
+            slices.append(
+                {
+                    "start": start.strftime(self.date_template),
+                    "end": self._get_end_date(start).strftime(self.date_template),
+                }
+            )
+            start = start.add(**self.time_interval)
+        return slices
+
     def read_records(
         self,
         sync_mode: SyncMode,
@@ -132,34 +152,35 @@ def read_records(
         stream_state: Mapping[str, Any] = None,
     ) -> Iterable[Mapping[str, Any]]:
         stream_state = stream_state or {}
-        params = self.request_params(stream_state=stream_state, stream_slice=stream_slice, next_page_token=None)
-
         # API returns data only when requested with a difference between 'start' and 'end' of 6 or more hours.
-        if pendulum.parse(params["start"]).add(hours=6) > pendulum.parse(params["end"]):
-            return []
+        start = pendulum.parse(stream_slice["start"]).add(hours=6)
+        end = pendulum.parse(stream_slice["end"])
+        if start > end:
+            yield from []
+
         # sometimes the API throws a 404 error for not obvious reasons, we have to handle it and log it.
         # for example, if there is no data from the specified time period, a 404 exception is thrown
         # https://developers.amplitude.com/docs/export-api#status-codes
+
         try:
+            self.logger.info(f"Fetching {self.name} time range: {start.strftime('%Y-%m-%d')} - {end.strftime('%Y-%m-%d')}")
             yield from super().read_records(sync_mode, cursor_field, stream_slice, stream_state)
         except requests.exceptions.HTTPError as error:
-            if error.response.status_code == 404:
-                self.logger.warn(f"Error during syncing {self.name} stream - {error}")
-                return []
+            status = error.response.status_code
+            if status in HTTP_ERROR_CODES.keys():
+                error_msg_from_status(status)
+                yield from []
             else:
+                self.logger.error(f"Error during syncing {self.name} stream - {error}")
                 raise
 
-    def request_params(
-        self, stream_state: Mapping[str, Any], next_page_token: Mapping[str, Any] = None, **kwargs
-    ) -> MutableMapping[str, Any]:
-        params = super().request_params(stream_state=stream_state, next_page_token=next_page_token, **kwargs)
-        if stream_state or next_page_token:
-            params["start"] = pendulum.parse(params["start"]).add(hours=1).strftime(self.date_template)
+    def request_params(self, stream_slice: Mapping[str, Any], **kwargs) -> MutableMapping[str, Any]:
+        params = self.base_params
+        params["start"] = pendulum.parse(stream_slice["start"]).strftime(self.date_template)
+        params["end"] = pendulum.parse(stream_slice["end"]).strftime(self.date_template)
         return params
 
-    def path(
-        self, stream_state: Mapping[str, Any] = None, stream_slice: Mapping[str, Any] = None, next_page_token: Mapping[str, Any] = None
-    ) -> str:
+    def path(self, **kwargs) -> str:
         return f"{self.api_version}/export"
 
 
@@ -168,9 +189,10 @@ class ActiveUsers(IncrementalAmplitudeStream):
     name = "active_users"
     primary_key = "date"
     time_interval = {"months": 1}
+    data_field = "data"
 
     def parse_response(self, response: requests.Response, **kwargs) -> Iterable[Mapping]:
-        response_data = response.json().get("data", [])
+        response_data = response.json().get(self.data_field, [])
         if response_data:
             series = list(map(list, zip(*response_data["series"])))
             for i, date in enumerate(response_data["xValues"]):
@@ -184,9 +206,10 @@ class AverageSessionLength(IncrementalAmplitudeStream):
     name = "average_session_length"
     primary_key = "date"
     time_interval = {"days": 15}
+    data_field = "data"
 
     def parse_response(self, response: requests.Response, **kwargs) -> Iterable[Mapping]:
-        response_data = response.json().get("data", [])
+        response_data = response.json().get(self.data_field, [])
         if response_data:
             # From the Amplitude documentation it follows that "series" is an array with one element which is itself
             # an array that contains the average session length for each day.
diff --git a/airbyte-integrations/connectors/source-amplitude/source_amplitude/errors.py b/airbyte-integrations/connectors/source-amplitude/source_amplitude/errors.py
new file mode 100644
index 00000000000000..037dd7f6401bdd
--- /dev/null
+++ b/airbyte-integrations/connectors/source-amplitude/source_amplitude/errors.py
@@ -0,0 +1,34 @@
+#
+# Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+#
+
+import logging
+
+LOGGER = logging.getLogger("airbyte")
+
+HTTP_ERROR_CODES = {
+    400: {
+        "msg": "The file size of the exported data is too large. Shorten the time ranges and try again. The limit size is 4GB.",
+        "lvl": "ERROR",
+    },
+    404: {
+        "msg": "No data collected",
+        "lvl": "WARN",
+    },
+    504: {
+        "msg": "The amount of data is large causing a timeout. For large amounts of data, the Amazon S3 destination is recommended.",
+        "lvl": "ERROR",
+    },
+}
+
+
+def error_msg_from_status(status: int = None):
+    if status:
+        level = HTTP_ERROR_CODES[status]["lvl"]
+        message = HTTP_ERROR_CODES[status]["msg"]
+        if level == "ERROR":
+            LOGGER.error(message)
+        elif level == "WARN":
+            LOGGER.warn(message)
+        else:
+            LOGGER.error(f"Unknown error occured: code {status}")
diff --git a/airbyte-integrations/connectors/source-amplitude/unit_tests/unit_test.py b/airbyte-integrations/connectors/source-amplitude/unit_tests/unit_test.py
index 8eb316ca38e35e..f691390f40ec15 100755
--- a/airbyte-integrations/connectors/source-amplitude/unit_tests/unit_test.py
+++ b/airbyte-integrations/connectors/source-amplitude/unit_tests/unit_test.py
@@ -2,9 +2,9 @@
 # Copyright (c) 2021 Airbyte, Inc., all rights reserved.
 #
 
-import airbyte_cdk.models
 import pytest
 import requests
+from airbyte_cdk.models import SyncMode
 from source_amplitude.api import Events
 
 
@@ -13,16 +13,29 @@ def __init__(self, status_code):
         self.status_code = status_code
 
 
-def test_http_error_handler(mocker):
+def test_incremental_http_error_handler(mocker):
     stream = Events(start_date="2021-01-01T00:00:00Z")
+    stream_slice = stream.stream_slices()[0]
 
     mock_response = MockRequest(404)
     send_request_mocker = mocker.patch.object(stream, "_send_request", side_effect=requests.HTTPError(**{"response": mock_response}))
     with pytest.raises(StopIteration):
-        result = next(stream.read_records(sync_mode=airbyte_cdk.models.SyncMode.full_refresh))
+        result = next(stream.read_records(sync_mode=SyncMode.full_refresh, stream_slice=stream_slice))
         assert result == []
 
     mock_response = MockRequest(403)
     send_request_mocker.side_effect = requests.HTTPError(**{"response": mock_response})
     with pytest.raises(requests.exceptions.HTTPError):
-        next(stream.read_records(sync_mode=airbyte_cdk.models.SyncMode.full_refresh))
+        next(stream.read_records(sync_mode=SyncMode.full_refresh, stream_slice=stream_slice))
+
+    mock_response = MockRequest(400)
+    send_request_mocker.side_effect = requests.HTTPError(**{"response": mock_response})
+    with pytest.raises(StopIteration):
+        result = next(stream.read_records(sync_mode=SyncMode.full_refresh, stream_slice=stream_slice))
+        assert result == []
+
+    mock_response = MockRequest(504)
+    send_request_mocker.side_effect = requests.HTTPError(**{"response": mock_response})
+    with pytest.raises(StopIteration):
+        result = next(stream.read_records(sync_mode=SyncMode.full_refresh, stream_slice=stream_slice))
+        assert result == []
diff --git a/airbyte-integrations/connectors/source-apify-dataset/Dockerfile b/airbyte-integrations/connectors/source-apify-dataset/Dockerfile
index fbf31c680e2f8e..3c25c0ce7cbd5c 100644
--- a/airbyte-integrations/connectors/source-apify-dataset/Dockerfile
+++ b/airbyte-integrations/connectors/source-apify-dataset/Dockerfile
@@ -12,5 +12,5 @@ RUN pip install .
 ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=0.1.9
+LABEL io.airbyte.version=0.1.11
 LABEL io.airbyte.name=airbyte/source-apify-dataset
diff --git a/airbyte-integrations/connectors/source-clickhouse/src/main/java/io/airbyte/integrations/source/clickhouse/ClickHouseSource.java b/airbyte-integrations/connectors/source-clickhouse/src/main/java/io/airbyte/integrations/source/clickhouse/ClickHouseSource.java
index aa255ccace20d4..3fd083e4387986 100644
--- a/airbyte-integrations/connectors/source-clickhouse/src/main/java/io/airbyte/integrations/source/clickhouse/ClickHouseSource.java
+++ b/airbyte-integrations/connectors/source-clickhouse/src/main/java/io/airbyte/integrations/source/clickhouse/ClickHouseSource.java
@@ -9,7 +9,7 @@
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.db.jdbc.JdbcDatabase;
 import io.airbyte.db.jdbc.JdbcUtils;
-import io.airbyte.db.jdbc.NoOpJdbcStreamingQueryConfiguration;
+import io.airbyte.db.jdbc.streaming.NoOpStreamingQueryConfig;
 import io.airbyte.integrations.base.IntegrationRunner;
 import io.airbyte.integrations.base.Source;
 import io.airbyte.integrations.base.ssh.SshWrappedSource;
@@ -72,13 +72,13 @@ public static Source getWrappedSource() {
   }
 
   /**
-   * The reason we use NoOpJdbcStreamingQueryConfiguration(not setting auto commit to false and not
-   * setting fetch size to 1000) for ClickHouse is cause method
+   * The reason we use NoOpStreamingQueryConfig(not setting auto commit to false and not setting fetch
+   * size to 1000) for ClickHouse is cause method
    * {@link ru.yandex.clickhouse.ClickHouseConnectionImpl#setAutoCommit} is empty and method
    * {@link ru.yandex.clickhouse.ClickHouseStatementImpl#setFetchSize} is empty
    */
   public ClickHouseSource() {
-    super(DRIVER_CLASS, new NoOpJdbcStreamingQueryConfiguration(), JdbcUtils.getDefaultSourceOperations());
+    super(DRIVER_CLASS, NoOpStreamingQueryConfig::new, JdbcUtils.getDefaultSourceOperations());
   }
 
   @Override
@@ -93,7 +93,7 @@ public JsonNode toDatabaseConfig(final JsonNode config) {
       jdbcUrl.append("?").append(String.join("&", SSL_PARAMETERS));
     }
 
-    ImmutableMap.Builder<Object, Object> configBuilder = ImmutableMap.builder()
+    final ImmutableMap.Builder<Object, Object> configBuilder = ImmutableMap.builder()
         .put("username", config.get("username").asText())
         .put("jdbc_url", jdbcUrl.toString());
 
diff --git a/airbyte-integrations/connectors/source-cockroachdb/src/main/java/io/airbyte/integrations/source/cockroachdb/CockroachDbSource.java b/airbyte-integrations/connectors/source-cockroachdb/src/main/java/io/airbyte/integrations/source/cockroachdb/CockroachDbSource.java
index 7e6d63de5878a9..bd2ebe01a3b363 100644
--- a/airbyte-integrations/connectors/source-cockroachdb/src/main/java/io/airbyte/integrations/source/cockroachdb/CockroachDbSource.java
+++ b/airbyte-integrations/connectors/source-cockroachdb/src/main/java/io/airbyte/integrations/source/cockroachdb/CockroachDbSource.java
@@ -12,6 +12,7 @@
 import io.airbyte.db.Databases;
 import io.airbyte.db.jdbc.JdbcDatabase;
 import io.airbyte.db.jdbc.JdbcUtils;
+import io.airbyte.db.jdbc.streaming.NoOpStreamingQueryConfig;
 import io.airbyte.integrations.base.IntegrationRunner;
 import io.airbyte.integrations.base.Source;
 import io.airbyte.integrations.base.ssh.SshWrappedSource;
@@ -40,7 +41,7 @@ public class CockroachDbSource extends AbstractJdbcSource<JDBCType> {
   public static final List<String> PORT_KEY = List.of("port");
 
   public CockroachDbSource() {
-    super(DRIVER_CLASS, null, new CockroachJdbcSourceOperations());
+    super(DRIVER_CLASS, NoOpStreamingQueryConfig::new, new CockroachJdbcSourceOperations());
   }
 
   public static Source sshWrappedSource() {
diff --git a/airbyte-integrations/connectors/source-db2-strict-encrypt/src/main/java/io/airbyte/integrations/source/db2_strict_encrypt/Db2JdbcStreamingQueryConfiguration.java b/airbyte-integrations/connectors/source-db2-strict-encrypt/src/main/java/io/airbyte/integrations/source/db2_strict_encrypt/Db2JdbcStreamingQueryConfiguration.java
deleted file mode 100644
index 71c7c3d00ca029..00000000000000
--- a/airbyte-integrations/connectors/source-db2-strict-encrypt/src/main/java/io/airbyte/integrations/source/db2_strict_encrypt/Db2JdbcStreamingQueryConfiguration.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
- */
-
-package io.airbyte.integrations.source.db2_strict_encrypt;
-
-import io.airbyte.db.jdbc.JdbcStreamingQueryConfiguration;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-public class Db2JdbcStreamingQueryConfiguration implements
-    JdbcStreamingQueryConfiguration {
-
-  @Override
-  public void accept(final Connection connection, final PreparedStatement preparedStatement)
-      throws SQLException {
-    connection.setAutoCommit(false);
-    preparedStatement.setFetchSize(1000);
-  }
-
-}
diff --git a/airbyte-integrations/connectors/source-db2/src/main/java/io.airbyte.integrations.source.db2/Db2Source.java b/airbyte-integrations/connectors/source-db2/src/main/java/io.airbyte.integrations.source.db2/Db2Source.java
index 8ec8eab83d0f5d..74b897c7d93b21 100644
--- a/airbyte-integrations/connectors/source-db2/src/main/java/io.airbyte.integrations.source.db2/Db2Source.java
+++ b/airbyte-integrations/connectors/source-db2/src/main/java/io.airbyte.integrations.source.db2/Db2Source.java
@@ -8,8 +8,8 @@
 import com.google.common.collect.ImmutableMap;
 import io.airbyte.commons.functional.CheckedFunction;
 import io.airbyte.commons.json.Jsons;
-import io.airbyte.db.jdbc.Db2JdbcStreamingQueryConfiguration;
 import io.airbyte.db.jdbc.JdbcDatabase;
+import io.airbyte.db.jdbc.streaming.AdaptiveStreamingQueryConfig;
 import io.airbyte.integrations.base.IntegrationRunner;
 import io.airbyte.integrations.base.Source;
 import io.airbyte.integrations.source.jdbc.AbstractJdbcSource;
@@ -35,13 +35,12 @@ public class Db2Source extends AbstractJdbcSource<JDBCType> implements Source {
   public static final String DRIVER_CLASS = "com.ibm.db2.jcc.DB2Driver";
   public static final String USERNAME = "username";
   public static final String PASSWORD = "password";
-  private static Db2SourceOperations operations;
 
   private static final String KEY_STORE_PASS = RandomStringUtils.randomAlphanumeric(8);
   private static final String KEY_STORE_FILE_PATH = "clientkeystore.jks";
 
   public Db2Source() {
-    super(DRIVER_CLASS, new Db2JdbcStreamingQueryConfiguration(), new Db2SourceOperations());
+    super(DRIVER_CLASS, AdaptiveStreamingQueryConfig::new, new Db2SourceOperations());
   }
 
   public static void main(final String[] args) throws Exception {
@@ -96,7 +95,7 @@ public Set<JdbcPrivilegeDto> getPrivilegesTableForCurrentUser(final JdbcDatabase
   }
 
   @Override
-  protected boolean isNotInternalSchema(JsonNode jsonNode, Set<String> internalSchemas) {
+  protected boolean isNotInternalSchema(final JsonNode jsonNode, final Set<String> internalSchemas) {
     return false;
   }
 
@@ -105,7 +104,7 @@ private CheckedFunction<Connection, PreparedStatement, SQLException> getPrivileg
         "SELECT DISTINCT OBJECTNAME, OBJECTSCHEMA FROM SYSIBMADM.PRIVILEGES WHERE OBJECTTYPE = 'TABLE' AND PRIVILEGE = 'SELECT' AND AUTHID = SESSION_USER");
   }
 
-  private JdbcPrivilegeDto getPrivilegeDto(JsonNode jsonNode) {
+  private JdbcPrivilegeDto getPrivilegeDto(final JsonNode jsonNode) {
     return JdbcPrivilegeDto.builder()
         .schemaName(jsonNode.get("OBJECTSCHEMA").asText().trim())
         .tableName(jsonNode.get("OBJECTNAME").asText())
diff --git a/airbyte-integrations/connectors/source-freshdesk/setup.py b/airbyte-integrations/connectors/source-freshdesk/setup.py
index bf1886fd6a9c18..323f191ae8db2b 100644
--- a/airbyte-integrations/connectors/source-freshdesk/setup.py
+++ b/airbyte-integrations/connectors/source-freshdesk/setup.py
@@ -14,6 +14,7 @@
 
 TEST_REQUIREMENTS = [
     "pytest==6.1.2",
+    "pytest-mock~=3.6",
     "requests_mock==1.8.0",
     "source-acceptance-test",
 ]
diff --git a/airbyte-integrations/connectors/source-freshdesk/source_freshdesk/spec.json b/airbyte-integrations/connectors/source-freshdesk/source_freshdesk/spec.json
index a21a411679181e..9a6eda81c34bcd 100644
--- a/airbyte-integrations/connectors/source-freshdesk/source_freshdesk/spec.json
+++ b/airbyte-integrations/connectors/source-freshdesk/source_freshdesk/spec.json
@@ -27,6 +27,7 @@
       },
       "start_date": {
         "title": "Start Date",
+        "type": "string",
         "description": "UTC date and time. Any data created after this date will be replicated. If this parameter is not set, all data will be replicated.",
         "format": "date-time",
         "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$",
diff --git a/airbyte-integrations/connectors/source-freshdesk/unit_tests/test_client.py b/airbyte-integrations/connectors/source-freshdesk/unit_tests/test_client.py
index 7c6b171ac7d592..9219fd64be9a48 100644
--- a/airbyte-integrations/connectors/source-freshdesk/unit_tests/test_client.py
+++ b/airbyte-integrations/connectors/source-freshdesk/unit_tests/test_client.py
@@ -5,11 +5,18 @@
 
 from pathlib import Path
 
+from pytest import fixture
 from source_freshdesk.client import Client
 
 HERE = Path(__file__).parent.absolute()
 
 
+@fixture(autouse=True)
+def time_sleep_mock(mocker):
+    time_mock = mocker.patch("time.sleep", lambda x: None)
+    yield time_mock
+
+
 def test_client_backoff_on_limit_reached(requests_mock):
     """Error once, check that we retry and not fail"""
     responses = [
diff --git a/airbyte-integrations/connectors/source-google-ads/Dockerfile b/airbyte-integrations/connectors/source-google-ads/Dockerfile
index 5557152bd28b0d..5d34b4e8a4a4c9 100644
--- a/airbyte-integrations/connectors/source-google-ads/Dockerfile
+++ b/airbyte-integrations/connectors/source-google-ads/Dockerfile
@@ -13,5 +13,5 @@ RUN pip install .
 
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=0.1.35
+LABEL io.airbyte.version=0.1.36
 LABEL io.airbyte.name=airbyte/source-google-ads
diff --git a/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/ad_group_ad_labels.json b/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/ad_group_ad_labels.json
index 5338f22aac8ae4..50c0377ae5789a 100644
--- a/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/ad_group_ad_labels.json
+++ b/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/ad_group_ad_labels.json
@@ -3,16 +3,16 @@
   "type": "object",
   "properties": {
     "ad_group_ad.ad.resource_name": {
-      "type": ["null", "integer"]
+      "type": ["null", "string"]
     },
     "ad_group_ad_label.resource_name": {
       "type": ["null", "string"]
     },
     "label.name": {
-      "type": ["null", "integer"]
+      "type": ["null", "string"]
     },
     "label.resource_name": {
-      "type": ["null", "integer"]
+      "type": ["null", "string"]
     }
   }
 }
diff --git a/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/ad_group_labels.json b/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/ad_group_labels.json
index 226aa638419820..ad0fb593eeeb99 100644
--- a/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/ad_group_labels.json
+++ b/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/ad_group_labels.json
@@ -3,16 +3,16 @@
   "type": "object",
   "properties": {
     "ad_group.resource_name": {
-      "type": ["null", "integer"]
+      "type": ["null", "string"]
     },
     "ad_group_label.resource_name": {
       "type": ["null", "string"]
     },
     "label.name": {
-      "type": ["null", "integer"]
+      "type": ["null", "string"]
     },
     "label.resource_name": {
-      "type": ["null", "integer"]
+      "type": ["null", "string"]
     }
   }
 }
diff --git a/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/campaign_labels.json b/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/campaign_labels.json
index 8ecd42b3dd5e02..022d767958f9f2 100644
--- a/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/campaign_labels.json
+++ b/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/campaign_labels.json
@@ -9,10 +9,10 @@
       "type": ["null", "string"]
     },
     "label.name": {
-      "type": ["null", "integer"]
+      "type": ["null", "string"]
     },
     "label.resource_name": {
-      "type": ["null", "integer"]
+      "type": ["null", "string"]
     }
   }
 }
diff --git a/airbyte-integrations/connectors/source-google-analytics-v4/source_google_analytics_v4/spec.json b/airbyte-integrations/connectors/source-google-analytics-v4/source_google_analytics_v4/spec.json
index 871aef715e4f16..07482cb89535b7 100644
--- a/airbyte-integrations/connectors/source-google-analytics-v4/source_google_analytics_v4/spec.json
+++ b/airbyte-integrations/connectors/source-google-analytics-v4/source_google_analytics_v4/spec.json
@@ -22,8 +22,8 @@
       },
       "window_in_days": {
         "type": "integer",
-        "title": "Window in days (Optional)",
-        "description": "The amount of days each stream slice would consist of beginning from start_date. Bigger the value - faster the fetch. (Min=1, as for a Day; Max=364, as for a Year).",
+        "title": "Data request window (Optional)",
+        "description": "The amount of data batched by the number of days. The bigger the value, the bigger the batch size and the lower the API requests made. (Min=1, as for a Day; Max=364, as for a Year).",
         "examples": [30, 60, 90, 120, 200, 364],
         "default": 1
       },
diff --git a/airbyte-integrations/connectors/source-hubspot/Dockerfile b/airbyte-integrations/connectors/source-hubspot/Dockerfile
index d7b8bd20b57224..504b0f5d2164d4 100644
--- a/airbyte-integrations/connectors/source-hubspot/Dockerfile
+++ b/airbyte-integrations/connectors/source-hubspot/Dockerfile
@@ -34,5 +34,5 @@ COPY source_hubspot ./source_hubspot
 ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=0.1.53
+LABEL io.airbyte.version=0.1.55
 LABEL io.airbyte.name=airbyte/source-hubspot
diff --git a/airbyte-integrations/connectors/source-hubspot/setup.py b/airbyte-integrations/connectors/source-hubspot/setup.py
index cf39bd55635066..76a85a488bf9f8 100644
--- a/airbyte-integrations/connectors/source-hubspot/setup.py
+++ b/airbyte-integrations/connectors/source-hubspot/setup.py
@@ -14,6 +14,7 @@
 
 TEST_REQUIREMENTS = [
     "pytest==6.1.2",
+    "pytest-mock~=3.6",
     "requests_mock==1.8.0",
     "source-acceptance-test",
 ]
diff --git a/airbyte-integrations/connectors/source-hubspot/source_hubspot/schemas/ticket_pipelines.json b/airbyte-integrations/connectors/source-hubspot/source_hubspot/schemas/ticket_pipelines.json
index b360fb642613eb..5d75223f315341 100644
--- a/airbyte-integrations/connectors/source-hubspot/source_hubspot/schemas/ticket_pipelines.json
+++ b/airbyte-integrations/connectors/source-hubspot/source_hubspot/schemas/ticket_pipelines.json
@@ -37,10 +37,12 @@
             "type": ["null", "string"]
           },
           "createdAt": {
-            "type": ["null", "integer"]
+            "type": ["null", "string"],
+            "format": "date-time"
           },
           "updatedAt": {
-            "type": ["null", "integer"]
+            "type": ["null", "string"],
+            "format": "date-time"
           },
           "active": {
             "type": ["null", "boolean"]
@@ -49,10 +51,12 @@
       }
     },
     "createdAt": {
-      "type": ["null", "integer"]
+      "type": ["null", "string"],
+      "format": "date-time"
     },
     "updatedAt": {
-      "type": ["null", "integer"]
+      "type": ["null", "string"],
+      "format": "date-time"
     }
   }
 }
diff --git a/airbyte-integrations/connectors/source-hubspot/unit_tests/test_source.py b/airbyte-integrations/connectors/source-hubspot/unit_tests/test_source.py
index b59ce456040bba..54b1722420f338 100644
--- a/airbyte-integrations/connectors/source-hubspot/unit_tests/test_source.py
+++ b/airbyte-integrations/connectors/source-hubspot/unit_tests/test_source.py
@@ -29,6 +29,12 @@
 logger = logging.getLogger("test_client")
 
 
+@pytest.fixture(autouse=True)
+def time_sleep_mock(mocker):
+    time_mock = mocker.patch("time.sleep", lambda x: None)
+    yield time_mock
+
+
 def test_check_connection_ok(requests_mock, config):
     responses = [
         {"json": [], "status_code": 200},
diff --git a/airbyte-integrations/connectors/source-hubspot/unit_tests/test_streams.py b/airbyte-integrations/connectors/source-hubspot/unit_tests/test_streams.py
index 256a2ff3bd67cb..d3016f5d500a0b 100644
--- a/airbyte-integrations/connectors/source-hubspot/unit_tests/test_streams.py
+++ b/airbyte-integrations/connectors/source-hubspot/unit_tests/test_streams.py
@@ -33,6 +33,12 @@
 from .utils import read_full_refresh, read_incremental
 
 
+@pytest.fixture(autouse=True)
+def time_sleep_mock(mocker):
+    time_mock = mocker.patch("time.sleep", lambda x: None)
+    yield time_mock
+
+
 def test_updated_at_field_non_exist_handler(requests_mock, common_params, fake_properties_list):
     stream = ContactLists(**common_params)
 
diff --git a/airbyte-integrations/connectors/source-jdbc/src/main/java/io/airbyte/integrations/source/jdbc/AbstractJdbcSource.java b/airbyte-integrations/connectors/source-jdbc/src/main/java/io/airbyte/integrations/source/jdbc/AbstractJdbcSource.java
index f85b4eebc0c55f..3ca4791c2981cc 100644
--- a/airbyte-integrations/connectors/source-jdbc/src/main/java/io/airbyte/integrations/source/jdbc/AbstractJdbcSource.java
+++ b/airbyte-integrations/connectors/source-jdbc/src/main/java/io/airbyte/integrations/source/jdbc/AbstractJdbcSource.java
@@ -29,8 +29,8 @@
 import io.airbyte.db.JdbcCompatibleSourceOperations;
 import io.airbyte.db.SqlDatabase;
 import io.airbyte.db.jdbc.JdbcDatabase;
-import io.airbyte.db.jdbc.JdbcStreamingQueryConfiguration;
 import io.airbyte.db.jdbc.JdbcUtils;
+import io.airbyte.db.jdbc.streaming.JdbcStreamingQueryConfig;
 import io.airbyte.integrations.base.Source;
 import io.airbyte.integrations.source.jdbc.dto.JdbcPrivilegeDto;
 import io.airbyte.integrations.source.relationaldb.AbstractRelationalDbSource;
@@ -49,6 +49,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Predicate;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.apache.commons.lang3.tuple.ImmutablePair;
@@ -65,16 +66,16 @@ public abstract class AbstractJdbcSource<Datatype> extends AbstractRelationalDbS
   private static final Logger LOGGER = LoggerFactory.getLogger(AbstractJdbcSource.class);
 
   protected final String driverClass;
-  protected final JdbcStreamingQueryConfiguration jdbcStreamingQueryConfiguration;
+  protected final Supplier<JdbcStreamingQueryConfig> streamingQueryConfigProvider;
   protected final JdbcCompatibleSourceOperations<Datatype> sourceOperations;
 
   protected String quoteString;
 
   public AbstractJdbcSource(final String driverClass,
-                            final JdbcStreamingQueryConfiguration jdbcStreamingQueryConfiguration,
+                            final Supplier<JdbcStreamingQueryConfig> streamingQueryConfigProvider,
                             final JdbcCompatibleSourceOperations<Datatype> sourceOperations) {
     this.driverClass = driverClass;
-    this.jdbcStreamingQueryConfiguration = jdbcStreamingQueryConfiguration;
+    this.streamingQueryConfigProvider = streamingQueryConfigProvider;
     this.sourceOperations = sourceOperations;
   }
 
@@ -289,11 +290,11 @@ public JdbcDatabase createDatabase(final JsonNode config) throws SQLException {
     final JsonNode jdbcConfig = toDatabaseConfig(config);
 
     final JdbcDatabase database = Databases.createStreamingJdbcDatabase(
-        jdbcConfig.get("username").asText(),
+        jdbcConfig.has("username") ? jdbcConfig.get("username").asText() : null,
         jdbcConfig.has("password") ? jdbcConfig.get("password").asText() : null,
         jdbcConfig.get("jdbc_url").asText(),
         driverClass,
-        jdbcStreamingQueryConfiguration,
+        streamingQueryConfigProvider,
         JdbcUtils.parseJdbcParameters(jdbcConfig, "connection_properties"),
         sourceOperations);
 
diff --git a/airbyte-integrations/connectors/source-jdbc/src/main/java/io/airbyte/integrations/source/jdbc/JdbcSource.java b/airbyte-integrations/connectors/source-jdbc/src/main/java/io/airbyte/integrations/source/jdbc/JdbcSource.java
index 66cb15d0c971d3..5d6443b1c352b4 100644
--- a/airbyte-integrations/connectors/source-jdbc/src/main/java/io/airbyte/integrations/source/jdbc/JdbcSource.java
+++ b/airbyte-integrations/connectors/source-jdbc/src/main/java/io/airbyte/integrations/source/jdbc/JdbcSource.java
@@ -6,7 +6,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import io.airbyte.db.jdbc.JdbcUtils;
-import io.airbyte.db.jdbc.PostgresJdbcStreamingQueryConfiguration;
+import io.airbyte.db.jdbc.streaming.AdaptiveStreamingQueryConfig;
 import io.airbyte.integrations.base.IntegrationRunner;
 import io.airbyte.integrations.base.Source;
 import java.sql.JDBCType;
@@ -19,7 +19,7 @@ public class JdbcSource extends AbstractJdbcSource<JDBCType> implements Source {
   private static final Logger LOGGER = LoggerFactory.getLogger(JdbcSource.class);
 
   public JdbcSource() {
-    super("org.postgresql.Driver", new PostgresJdbcStreamingQueryConfiguration(), JdbcUtils.getDefaultSourceOperations());
+    super("org.postgresql.Driver", AdaptiveStreamingQueryConfig::new, JdbcUtils.getDefaultSourceOperations());
   }
 
   // no-op for JdbcSource since the config it receives is designed to be use for JDBC.
diff --git a/airbyte-integrations/connectors/source-jdbc/src/test/java/io/airbyte/integrations/source/jdbc/AbstractJdbcSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-jdbc/src/test/java/io/airbyte/integrations/source/jdbc/AbstractJdbcSourceAcceptanceTest.java
index ba4e8a5e33046a..d81b0a3d466e89 100644
--- a/airbyte-integrations/connectors/source-jdbc/src/test/java/io/airbyte/integrations/source/jdbc/AbstractJdbcSourceAcceptanceTest.java
+++ b/airbyte-integrations/connectors/source-jdbc/src/test/java/io/airbyte/integrations/source/jdbc/AbstractJdbcSourceAcceptanceTest.java
@@ -10,7 +10,7 @@
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.commons.string.Strings;
 import io.airbyte.db.jdbc.JdbcUtils;
-import io.airbyte.db.jdbc.PostgresJdbcStreamingQueryConfiguration;
+import io.airbyte.db.jdbc.streaming.AdaptiveStreamingQueryConfig;
 import io.airbyte.integrations.base.IntegrationRunner;
 import io.airbyte.integrations.base.Source;
 import io.airbyte.integrations.source.jdbc.test.JdbcSourceAcceptanceTest;
@@ -93,7 +93,7 @@ private static class PostgresTestSource extends AbstractJdbcSource<JDBCType> imp
     static final String DRIVER_CLASS = "org.postgresql.Driver";
 
     public PostgresTestSource() {
-      super(DRIVER_CLASS, new PostgresJdbcStreamingQueryConfiguration(), JdbcUtils.getDefaultSourceOperations());
+      super(DRIVER_CLASS, AdaptiveStreamingQueryConfig::new, JdbcUtils.getDefaultSourceOperations());
     }
 
     @Override
diff --git a/airbyte-integrations/connectors/source-jdbc/src/test/java/io/airbyte/integrations/source/jdbc/DefaultJdbcStressTest.java b/airbyte-integrations/connectors/source-jdbc/src/test/java/io/airbyte/integrations/source/jdbc/DefaultJdbcStressTest.java
index 4d2ba5ad427473..06ca30f2b3ba56 100644
--- a/airbyte-integrations/connectors/source-jdbc/src/test/java/io/airbyte/integrations/source/jdbc/DefaultJdbcStressTest.java
+++ b/airbyte-integrations/connectors/source-jdbc/src/test/java/io/airbyte/integrations/source/jdbc/DefaultJdbcStressTest.java
@@ -10,7 +10,7 @@
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.commons.string.Strings;
 import io.airbyte.db.jdbc.JdbcUtils;
-import io.airbyte.db.jdbc.PostgresJdbcStreamingQueryConfiguration;
+import io.airbyte.db.jdbc.streaming.AdaptiveStreamingQueryConfig;
 import io.airbyte.integrations.base.IntegrationRunner;
 import io.airbyte.integrations.base.Source;
 import io.airbyte.integrations.source.jdbc.test.JdbcStressTest;
@@ -98,7 +98,7 @@ private static class PostgresTestSource extends AbstractJdbcSource<JDBCType> imp
     static final String DRIVER_CLASS = "org.postgresql.Driver";
 
     public PostgresTestSource() {
-      super(DRIVER_CLASS, new PostgresJdbcStreamingQueryConfiguration(), JdbcUtils.getDefaultSourceOperations());
+      super(DRIVER_CLASS, AdaptiveStreamingQueryConfig::new, JdbcUtils.getDefaultSourceOperations());
     }
 
     @Override
diff --git a/airbyte-integrations/connectors/source-jdbc/src/test/java/io/airbyte/integrations/source/jdbc/JdbcSourceStressTest.java b/airbyte-integrations/connectors/source-jdbc/src/test/java/io/airbyte/integrations/source/jdbc/JdbcSourceStressTest.java
index bb542c0401dfd3..192fdb38a1e4ce 100644
--- a/airbyte-integrations/connectors/source-jdbc/src/test/java/io/airbyte/integrations/source/jdbc/JdbcSourceStressTest.java
+++ b/airbyte-integrations/connectors/source-jdbc/src/test/java/io/airbyte/integrations/source/jdbc/JdbcSourceStressTest.java
@@ -10,7 +10,7 @@
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.commons.string.Strings;
 import io.airbyte.db.jdbc.JdbcUtils;
-import io.airbyte.db.jdbc.PostgresJdbcStreamingQueryConfiguration;
+import io.airbyte.db.jdbc.streaming.AdaptiveStreamingQueryConfig;
 import io.airbyte.integrations.base.IntegrationRunner;
 import io.airbyte.integrations.base.Source;
 import io.airbyte.integrations.source.jdbc.test.JdbcStressTest;
@@ -96,7 +96,7 @@ private static class PostgresTestSource extends AbstractJdbcSource<JDBCType> imp
     static final String DRIVER_CLASS = "org.postgresql.Driver";
 
     public PostgresTestSource() {
-      super(DRIVER_CLASS, new PostgresJdbcStreamingQueryConfiguration(), JdbcUtils.getDefaultSourceOperations());
+      super(DRIVER_CLASS, AdaptiveStreamingQueryConfig::new, JdbcUtils.getDefaultSourceOperations());
     }
 
     @Override
diff --git a/airbyte-integrations/connectors/source-mixpanel/Dockerfile b/airbyte-integrations/connectors/source-mixpanel/Dockerfile
index 99bea641bf4f32..1e2c0c416bc6db 100644
--- a/airbyte-integrations/connectors/source-mixpanel/Dockerfile
+++ b/airbyte-integrations/connectors/source-mixpanel/Dockerfile
@@ -13,5 +13,5 @@ ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
 
-LABEL io.airbyte.version=0.1.12
+LABEL io.airbyte.version=0.1.13
 LABEL io.airbyte.name=airbyte/source-mixpanel
diff --git a/airbyte-integrations/connectors/source-mixpanel/unit_tests/test_streams.py b/airbyte-integrations/connectors/source-mixpanel/unit_tests/test_streams.py
index 71caf4b9b6fdf7..aa2623f83ea9ae 100644
--- a/airbyte-integrations/connectors/source-mixpanel/unit_tests/test_streams.py
+++ b/airbyte-integrations/connectors/source-mixpanel/unit_tests/test_streams.py
@@ -41,6 +41,12 @@ def patch_incremental_base_class(mocker):
     mocker.patch.object(IncrementalMixpanelStream, "__abstractmethods__", set())
 
 
+@pytest.fixture(autouse=True)
+def time_sleep_mock(mocker):
+    time_mock = mocker.patch("time.sleep", lambda x: None)
+    yield time_mock
+
+
 def test_url_base(patch_base_class):
     stream = MixpanelStream(authenticator=MagicMock())
 
diff --git a/airbyte-integrations/connectors/source-mssql/src/main/java/io/airbyte/integrations/source/mssql/MssqlJdbcStreamingQueryConfiguration.java b/airbyte-integrations/connectors/source-mssql/src/main/java/io/airbyte/integrations/source/mssql/MssqlJdbcStreamingQueryConfiguration.java
deleted file mode 100644
index 71c1001b542f51..00000000000000
--- a/airbyte-integrations/connectors/source-mssql/src/main/java/io/airbyte/integrations/source/mssql/MssqlJdbcStreamingQueryConfiguration.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
- */
-
-package io.airbyte.integrations.source.mssql;
-
-import io.airbyte.db.jdbc.JdbcStreamingQueryConfiguration;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-public class MssqlJdbcStreamingQueryConfiguration implements JdbcStreamingQueryConfiguration {
-
-  @Override
-  public void accept(final Connection connection, final PreparedStatement preparedStatement) throws SQLException {
-    connection.setAutoCommit(false);
-    preparedStatement.setFetchSize(1000);
-  }
-
-}
diff --git a/airbyte-integrations/connectors/source-mssql/src/main/java/io/airbyte/integrations/source/mssql/MssqlSource.java b/airbyte-integrations/connectors/source-mssql/src/main/java/io/airbyte/integrations/source/mssql/MssqlSource.java
index 94a3f4bcf77116..3af72f59dea6be 100644
--- a/airbyte-integrations/connectors/source-mssql/src/main/java/io/airbyte/integrations/source/mssql/MssqlSource.java
+++ b/airbyte-integrations/connectors/source-mssql/src/main/java/io/airbyte/integrations/source/mssql/MssqlSource.java
@@ -17,6 +17,7 @@
 import io.airbyte.commons.util.AutoCloseableIterator;
 import io.airbyte.commons.util.AutoCloseableIterators;
 import io.airbyte.db.jdbc.JdbcDatabase;
+import io.airbyte.db.jdbc.streaming.AdaptiveStreamingQueryConfig;
 import io.airbyte.integrations.base.IntegrationRunner;
 import io.airbyte.integrations.base.Source;
 import io.airbyte.integrations.base.ssh.SshWrappedSource;
@@ -63,20 +64,20 @@ public static Source sshWrappedSource() {
   }
 
   MssqlSource() {
-    super(DRIVER_CLASS, new MssqlJdbcStreamingQueryConfiguration(), new MssqlSourceOperations());
+    super(DRIVER_CLASS, AdaptiveStreamingQueryConfig::new, new MssqlSourceOperations());
   }
 
   @Override
-  public AutoCloseableIterator<JsonNode> queryTableFullRefresh(JdbcDatabase database,
-                                                               List<String> columnNames,
-                                                               String schemaName,
-                                                               String tableName) {
+  public AutoCloseableIterator<JsonNode> queryTableFullRefresh(final JdbcDatabase database,
+                                                               final List<String> columnNames,
+                                                               final String schemaName,
+                                                               final String tableName) {
     LOGGER.info("Queueing query for table: {}", tableName);
 
-    List<String> newIdentifiersList = getWrappedColumn(database,
+    final List<String> newIdentifiersList = getWrappedColumn(database,
         columnNames,
         schemaName, tableName, "\"");
-    String preparedSqlQuery = String
+    final String preparedSqlQuery = String
         .format("SELECT %s FROM %s", String.join(",", newIdentifiersList),
             getFullTableName(schemaName, tableName));
 
@@ -85,13 +86,13 @@ public AutoCloseableIterator<JsonNode> queryTableFullRefresh(JdbcDatabase databa
   }
 
   @Override
-  public AutoCloseableIterator<JsonNode> queryTableIncremental(JdbcDatabase database,
-                                                               List<String> columnNames,
-                                                               String schemaName,
-                                                               String tableName,
-                                                               String cursorField,
-                                                               JDBCType cursorFieldType,
-                                                               String cursor) {
+  public AutoCloseableIterator<JsonNode> queryTableIncremental(final JdbcDatabase database,
+                                                               final List<String> columnNames,
+                                                               final String schemaName,
+                                                               final String tableName,
+                                                               final String cursorField,
+                                                               final JDBCType cursorFieldType,
+                                                               final String cursor) {
     LOGGER.info("Queueing query for table: {}", tableName);
     return AutoCloseableIterators.lazyIterator(() -> {
       try {
@@ -101,7 +102,7 @@ public AutoCloseableIterator<JsonNode> queryTableIncremental(JdbcDatabase databa
 
               final String identifierQuoteString = connection.getMetaData()
                   .getIdentifierQuoteString();
-              List<String> newColumnNames = getWrappedColumn(database,
+              final List<String> newColumnNames = getWrappedColumn(database,
                   columnNames, schemaName, tableName, identifierQuoteString);
 
               final String sql = String.format("SELECT %s FROM %s WHERE %s > ?",
@@ -133,14 +134,14 @@ public AutoCloseableIterator<JsonNode> queryTableIncremental(JdbcDatabase databa
    *
    * @return the list with Column names updated to handle functions (if nay) properly
    */
-  private List<String> getWrappedColumn(JdbcDatabase database,
-                                        List<String> columnNames,
-                                        String schemaName,
-                                        String tableName,
-                                        String enquoteSymbol) {
-    List<String> hierarchyIdColumns = new ArrayList<>();
+  private List<String> getWrappedColumn(final JdbcDatabase database,
+                                        final List<String> columnNames,
+                                        final String schemaName,
+                                        final String tableName,
+                                        final String enquoteSymbol) {
+    final List<String> hierarchyIdColumns = new ArrayList<>();
     try {
-      SQLServerResultSetMetaData sqlServerResultSetMetaData = (SQLServerResultSetMetaData) database
+      final SQLServerResultSetMetaData sqlServerResultSetMetaData = (SQLServerResultSetMetaData) database
           .queryMetadata(String
               .format("SELECT TOP 1 %s FROM %s", // only first row is enough to get field's type
                   enquoteIdentifierList(columnNames),
@@ -155,7 +156,7 @@ private List<String> getWrappedColumn(JdbcDatabase database,
         }
       }
 
-    } catch (SQLException e) {
+    } catch (final SQLException e) {
       LOGGER.error("Failed to fetch metadata to prepare a proper request.", e);
     }
 
diff --git a/airbyte-integrations/connectors/source-mssql/src/test/java/io/airbyte/integrations/source/mssql/CdcMssqlSourceTest.java b/airbyte-integrations/connectors/source-mssql/src/test/java/io/airbyte/integrations/source/mssql/CdcMssqlSourceTest.java
index 6438e29d96660a..b2b063aa69f17c 100644
--- a/airbyte-integrations/connectors/source-mssql/src/test/java/io/airbyte/integrations/source/mssql/CdcMssqlSourceTest.java
+++ b/airbyte-integrations/connectors/source-mssql/src/test/java/io/airbyte/integrations/source/mssql/CdcMssqlSourceTest.java
@@ -27,6 +27,7 @@
 import io.airbyte.db.Database;
 import io.airbyte.db.Databases;
 import io.airbyte.db.jdbc.JdbcDatabase;
+import io.airbyte.db.jdbc.streaming.AdaptiveStreamingQueryConfig;
 import io.airbyte.integrations.base.Source;
 import io.airbyte.integrations.debezium.CdcSourceTest;
 import io.airbyte.integrations.debezium.CdcTargetPosition;
@@ -316,7 +317,7 @@ protected CdcTargetPosition cdcLatestTargetPosition() {
             config.get("port").asInt(),
             dbName),
         DRIVER_CLASS,
-        new MssqlJdbcStreamingQueryConfiguration(),
+        AdaptiveStreamingQueryConfig::new,
         Maps.newHashMap(),
         new MssqlSourceOperations());
     return MssqlCdcTargetPosition.getTargetPosition(jdbcDatabase, dbName);
diff --git a/airbyte-integrations/connectors/source-mysql/src/main/java/io/airbyte/integrations/source/mysql/MySqlJdbcStreamingQueryConfiguration.java b/airbyte-integrations/connectors/source-mysql/src/main/java/io/airbyte/integrations/source/mysql/MySqlJdbcStreamingQueryConfiguration.java
deleted file mode 100644
index b8b46c1505e1a2..00000000000000
--- a/airbyte-integrations/connectors/source-mysql/src/main/java/io/airbyte/integrations/source/mysql/MySqlJdbcStreamingQueryConfiguration.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
- */
-
-package io.airbyte.integrations.source.mysql;
-
-import io.airbyte.db.jdbc.JdbcStreamingQueryConfiguration;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-public class MySqlJdbcStreamingQueryConfiguration implements JdbcStreamingQueryConfiguration {
-
-  @Override
-  public void accept(final Connection connection, final PreparedStatement preparedStatement) throws SQLException {
-    // This is only respected if "useCursorFetch=true" is set in the connection. See the "resultset"
-    // section the MySql docs for more details.
-    // https://dev.mysql.com/doc/connector-j/8.0/en/connector-j-reference-implementation-notes.html.
-    // When using this approach MySql creates a temporary table which may have some effect on db
-    // performance.
-    // e.g. conn = DriverManager.getConnection("jdbc:mysql://localhost/?useCursorFetch=true", "user",
-    // "s3cr3t");
-    // We set userCursorFetch in MySqlSource.
-    connection.setAutoCommit(false);
-    preparedStatement.setFetchSize(1000);
-    // If for some reason, you cannot set useCursorFetch in the connection, fall back on this
-    // implementation below. It fetches records one at a time, which while inefficient, at least does
-    // not risk OOM.
-    // connection.setAutoCommit(false);
-    // preparedStatement.setFetchSize(Integer.MIN_VALUE);
-  }
-
-}
diff --git a/airbyte-integrations/connectors/source-mysql/src/main/java/io/airbyte/integrations/source/mysql/MySqlSource.java b/airbyte-integrations/connectors/source-mysql/src/main/java/io/airbyte/integrations/source/mysql/MySqlSource.java
index aef618a469f19b..9afbfc53926947 100644
--- a/airbyte-integrations/connectors/source-mysql/src/main/java/io/airbyte/integrations/source/mysql/MySqlSource.java
+++ b/airbyte-integrations/connectors/source-mysql/src/main/java/io/airbyte/integrations/source/mysql/MySqlSource.java
@@ -17,6 +17,7 @@
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.commons.util.AutoCloseableIterator;
 import io.airbyte.db.jdbc.JdbcDatabase;
+import io.airbyte.db.jdbc.streaming.AdaptiveStreamingQueryConfig;
 import io.airbyte.integrations.base.IntegrationRunner;
 import io.airbyte.integrations.base.Source;
 import io.airbyte.integrations.base.ssh.SshWrappedSource;
@@ -61,7 +62,7 @@ public static Source sshWrappedSource() {
   }
 
   public MySqlSource() {
-    super(DRIVER_CLASS, new MySqlJdbcStreamingQueryConfiguration(), new MySqlSourceOperations());
+    super(DRIVER_CLASS, AdaptiveStreamingQueryConfig::new, new MySqlSourceOperations());
   }
 
   private static AirbyteStream removeIncrementalWithoutPk(final AirbyteStream stream) {
@@ -129,7 +130,10 @@ public JsonNode toDatabaseConfig(final JsonNode config) {
         config.get("port").asText(),
         config.get("database").asText()));
 
-    // see MySqlJdbcStreamingQueryConfiguration for more context on why useCursorFetch=true is needed.
+    // To fetch the result in batches, the "useCursorFetch=true" must be set.
+    // https://dev.mysql.com/doc/connector-j/8.0/en/connector-j-reference-implementation-notes.html.
+    // When using this approach MySql creates a temporary table which may have some effect on db
+    // performance.
     jdbcUrl.append("?useCursorFetch=true");
     jdbcUrl.append("&zeroDateTimeBehavior=convertToNull");
     // ensure the return tinyint(1) is boolean
@@ -181,8 +185,8 @@ public List<AutoCloseableIterator<AirbyteMessage>> getIncrementalIterators(final
           new AirbyteDebeziumHandler(sourceConfig, MySqlCdcTargetPosition.targetPosition(database), MySqlCdcProperties.getDebeziumProperties(),
               catalog, true);
 
-      Optional<CdcState> cdcState = Optional.ofNullable(stateManager.getCdcStateManager().getCdcState());
-      MySqlCdcSavedInfoFetcher fetcher = new MySqlCdcSavedInfoFetcher(cdcState.orElse(null));
+      final Optional<CdcState> cdcState = Optional.ofNullable(stateManager.getCdcStateManager().getCdcState());
+      final MySqlCdcSavedInfoFetcher fetcher = new MySqlCdcSavedInfoFetcher(cdcState.orElse(null));
       cdcState.ifPresent(cdc -> checkBinlog(cdc.getState(), database));
       return handler.getIncrementalIterators(fetcher, new MySqlCdcStateHandler(stateManager), new MySqlCdcConnectorMetadataInjector(), emittedAt);
     } else {
diff --git a/airbyte-integrations/connectors/source-openweather/Dockerfile b/airbyte-integrations/connectors/source-openweather/Dockerfile
index 8b82589d62f2af..b344b066bd4754 100644
--- a/airbyte-integrations/connectors/source-openweather/Dockerfile
+++ b/airbyte-integrations/connectors/source-openweather/Dockerfile
@@ -34,5 +34,5 @@ COPY source_openweather ./source_openweather
 ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=0.1.1
+LABEL io.airbyte.version=0.1.4
 LABEL io.airbyte.name=airbyte/source-openweather
diff --git a/airbyte-integrations/connectors/source-oracle/src/main/java/io/airbyte/integrations/source/oracle/OracleSource.java b/airbyte-integrations/connectors/source-oracle/src/main/java/io/airbyte/integrations/source/oracle/OracleSource.java
index 764d85d690c586..94813f54fff3e8 100644
--- a/airbyte-integrations/connectors/source-oracle/src/main/java/io/airbyte/integrations/source/oracle/OracleSource.java
+++ b/airbyte-integrations/connectors/source-oracle/src/main/java/io/airbyte/integrations/source/oracle/OracleSource.java
@@ -9,7 +9,7 @@
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.db.jdbc.JdbcDatabase;
 import io.airbyte.db.jdbc.JdbcUtils;
-import io.airbyte.db.jdbc.OracleJdbcStreamingQueryConfiguration;
+import io.airbyte.db.jdbc.streaming.AdaptiveStreamingQueryConfig;
 import io.airbyte.integrations.base.IntegrationRunner;
 import io.airbyte.integrations.base.Source;
 import io.airbyte.integrations.base.ssh.SshWrappedSource;
@@ -45,7 +45,7 @@ enum Protocol {
   }
 
   public OracleSource() {
-    super(DRIVER_CLASS, new OracleJdbcStreamingQueryConfiguration(), JdbcUtils.getDefaultSourceOperations());
+    super(DRIVER_CLASS, AdaptiveStreamingQueryConfig::new, JdbcUtils.getDefaultSourceOperations());
   }
 
   public static Source sshWrappedSource() {
diff --git a/airbyte-integrations/connectors/source-oracle/src/test/java/io/airbyte/integrations/source/oracle/OracleStressTest.java b/airbyte-integrations/connectors/source-oracle/src/test/java/io/airbyte/integrations/source/oracle/OracleStressTest.java
index f1ab08a5115776..cdca797efd006d 100644
--- a/airbyte-integrations/connectors/source-oracle/src/test/java/io/airbyte/integrations/source/oracle/OracleStressTest.java
+++ b/airbyte-integrations/connectors/source-oracle/src/test/java/io/airbyte/integrations/source/oracle/OracleStressTest.java
@@ -8,7 +8,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.db.jdbc.JdbcUtils;
-import io.airbyte.db.jdbc.OracleJdbcStreamingQueryConfiguration;
+import io.airbyte.db.jdbc.streaming.AdaptiveStreamingQueryConfig;
 import io.airbyte.integrations.base.IntegrationRunner;
 import io.airbyte.integrations.base.Source;
 import io.airbyte.integrations.source.jdbc.AbstractJdbcSource;
@@ -93,7 +93,7 @@ private static class OracleTestSource extends AbstractJdbcSource<JDBCType> imple
     static final String DRIVER_CLASS = "oracle.jdbc.OracleDriver";
 
     public OracleTestSource() {
-      super(DRIVER_CLASS, new OracleJdbcStreamingQueryConfiguration(), JdbcUtils.getDefaultSourceOperations());
+      super(DRIVER_CLASS, AdaptiveStreamingQueryConfig::new, JdbcUtils.getDefaultSourceOperations());
     }
 
     @Override
diff --git a/airbyte-integrations/connectors/source-paypal-transaction/Dockerfile b/airbyte-integrations/connectors/source-paypal-transaction/Dockerfile
index 3372b968013222..0c89c2ae46500e 100644
--- a/airbyte-integrations/connectors/source-paypal-transaction/Dockerfile
+++ b/airbyte-integrations/connectors/source-paypal-transaction/Dockerfile
@@ -12,5 +12,5 @@ RUN pip install .
 ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=0.1.4
+LABEL io.airbyte.version=0.1.5
 LABEL io.airbyte.name=airbyte/source-paypal-transaction
diff --git a/airbyte-integrations/connectors/source-paypal-transaction/setup.py b/airbyte-integrations/connectors/source-paypal-transaction/setup.py
index 2ff46a9c8ea387..73c3a8ad9fa8c1 100644
--- a/airbyte-integrations/connectors/source-paypal-transaction/setup.py
+++ b/airbyte-integrations/connectors/source-paypal-transaction/setup.py
@@ -11,6 +11,7 @@
 
 TEST_REQUIREMENTS = [
     "pytest~=6.1",
+    "pytest-mock~=3.6",
     "source-acceptance-test",
 ]
 
diff --git a/airbyte-integrations/connectors/source-paypal-transaction/unit_tests/unit_test.py b/airbyte-integrations/connectors/source-paypal-transaction/unit_tests/unit_test.py
index e43122a439b4f9..30f0acf3025f27 100644
--- a/airbyte-integrations/connectors/source-paypal-transaction/unit_tests/unit_test.py
+++ b/airbyte-integrations/connectors/source-paypal-transaction/unit_tests/unit_test.py
@@ -6,9 +6,16 @@
 
 from airbyte_cdk.sources.streams.http.auth import NoAuth
 from dateutil.parser import isoparse
+from pytest import fixture
 from source_paypal_transaction.source import Balances, PaypalTransactionStream, Transactions
 
 
+@fixture(autouse=True)
+def time_sleep_mock(mocker):
+    time_mock = mocker.patch("time.sleep", lambda x: None)
+    yield time_mock
+
+
 def test_get_field():
 
     record = {"a": {"b": {"c": "d"}}}
diff --git a/airbyte-integrations/connectors/source-postgres/src/main/java/io/airbyte/integrations/source/postgres/PostgresSource.java b/airbyte-integrations/connectors/source-postgres/src/main/java/io/airbyte/integrations/source/postgres/PostgresSource.java
index 88c30e5c5d7dfe..bbc397b0cd2ba6 100644
--- a/airbyte-integrations/connectors/source-postgres/src/main/java/io/airbyte/integrations/source/postgres/PostgresSource.java
+++ b/airbyte-integrations/connectors/source-postgres/src/main/java/io/airbyte/integrations/source/postgres/PostgresSource.java
@@ -17,7 +17,7 @@
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.commons.util.AutoCloseableIterator;
 import io.airbyte.db.jdbc.JdbcDatabase;
-import io.airbyte.db.jdbc.PostgresJdbcStreamingQueryConfiguration;
+import io.airbyte.db.jdbc.streaming.AdaptiveStreamingQueryConfig;
 import io.airbyte.integrations.base.IntegrationRunner;
 import io.airbyte.integrations.base.Source;
 import io.airbyte.integrations.base.ssh.SshWrappedSource;
@@ -57,7 +57,7 @@ public static Source sshWrappedSource() {
   }
 
   PostgresSource() {
-    super(DRIVER_CLASS, new PostgresJdbcStreamingQueryConfiguration(), new PostgresSourceOperations());
+    super(DRIVER_CLASS, AdaptiveStreamingQueryConfig::new, new PostgresSourceOperations());
   }
 
   @Override
@@ -129,15 +129,15 @@ public AirbyteCatalog discover(final JsonNode config) throws Exception {
   }
 
   @Override
-  public List<TableInfo<CommonField<JDBCType>>> discoverInternal(JdbcDatabase database) throws Exception {
+  public List<TableInfo<CommonField<JDBCType>>> discoverInternal(final JdbcDatabase database) throws Exception {
     if (schemas != null && !schemas.isEmpty()) {
       // process explicitly selected (from UI) schemas
       final List<TableInfo<CommonField<JDBCType>>> internals = new ArrayList<>();
-      for (String schema : schemas) {
+      for (final String schema : schemas) {
         LOGGER.debug("Discovering schema: {}", schema);
         internals.addAll(super.discoverInternal(database, schema));
       }
-      for (TableInfo<CommonField<JDBCType>> info : internals) {
+      for (final TableInfo<CommonField<JDBCType>> info : internals) {
         LOGGER.debug("Found table (schema: {}): {}", info.getNameSpace(), info.getName());
       }
       return internals;
@@ -327,7 +327,7 @@ public Set<JdbcPrivilegeDto> getPrivilegesTableForCurrentUser(final JdbcDatabase
   }
 
   @Override
-  protected boolean isNotInternalSchema(JsonNode jsonNode, Set<String> internalSchemas) {
+  protected boolean isNotInternalSchema(final JsonNode jsonNode, final Set<String> internalSchemas) {
     return false;
   }
 
diff --git a/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresStressTest.java b/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresStressTest.java
index 0f30e4fa07f94d..75773468b57767 100644
--- a/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresStressTest.java
+++ b/airbyte-integrations/connectors/source-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresStressTest.java
@@ -10,7 +10,7 @@
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.commons.string.Strings;
 import io.airbyte.db.jdbc.JdbcUtils;
-import io.airbyte.db.jdbc.PostgresJdbcStreamingQueryConfiguration;
+import io.airbyte.db.jdbc.streaming.AdaptiveStreamingQueryConfig;
 import io.airbyte.integrations.base.IntegrationRunner;
 import io.airbyte.integrations.base.Source;
 import io.airbyte.integrations.source.jdbc.AbstractJdbcSource;
@@ -98,7 +98,7 @@ private static class PostgresTestSource extends AbstractJdbcSource<JDBCType> imp
     static final String DRIVER_CLASS = "org.postgresql.Driver";
 
     public PostgresTestSource() {
-      super(DRIVER_CLASS, new PostgresJdbcStreamingQueryConfiguration(), JdbcUtils.getDefaultSourceOperations());
+      super(DRIVER_CLASS, AdaptiveStreamingQueryConfig::new, JdbcUtils.getDefaultSourceOperations());
     }
 
     @Override
diff --git a/airbyte-integrations/connectors/source-redshift/src/main/java/io/airbyte/integrations/source/redshift/RedshiftJdbcStreamingQueryConfiguration.java b/airbyte-integrations/connectors/source-redshift/src/main/java/io/airbyte/integrations/source/redshift/RedshiftJdbcStreamingQueryConfiguration.java
deleted file mode 100644
index b7a2ee71620731..00000000000000
--- a/airbyte-integrations/connectors/source-redshift/src/main/java/io/airbyte/integrations/source/redshift/RedshiftJdbcStreamingQueryConfiguration.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
- */
-
-package io.airbyte.integrations.source.redshift;
-
-import io.airbyte.db.jdbc.JdbcStreamingQueryConfiguration;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-public class RedshiftJdbcStreamingQueryConfiguration implements JdbcStreamingQueryConfiguration {
-
-  // aws docs on how setting up batching:
-  // https://docs.aws.amazon.com/redshift/latest/dg/queries-troubleshooting.html
-  @Override
-  public void accept(final Connection connection, final PreparedStatement preparedStatement) throws SQLException {
-    connection.setAutoCommit(false);
-    preparedStatement.setFetchSize(1000);
-  }
-
-}
diff --git a/airbyte-integrations/connectors/source-redshift/src/main/java/io/airbyte/integrations/source/redshift/RedshiftSource.java b/airbyte-integrations/connectors/source-redshift/src/main/java/io/airbyte/integrations/source/redshift/RedshiftSource.java
index df025ced67edb1..b81e77dd71a1a4 100644
--- a/airbyte-integrations/connectors/source-redshift/src/main/java/io/airbyte/integrations/source/redshift/RedshiftSource.java
+++ b/airbyte-integrations/connectors/source-redshift/src/main/java/io/airbyte/integrations/source/redshift/RedshiftSource.java
@@ -9,6 +9,7 @@
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.db.jdbc.JdbcDatabase;
 import io.airbyte.db.jdbc.JdbcUtils;
+import io.airbyte.db.jdbc.streaming.AdaptiveStreamingQueryConfig;
 import io.airbyte.integrations.base.IntegrationRunner;
 import io.airbyte.integrations.base.Source;
 import io.airbyte.integrations.source.jdbc.AbstractJdbcSource;
@@ -35,7 +36,7 @@ public class RedshiftSource extends AbstractJdbcSource<JDBCType> implements Sour
   // todo (cgardens) - clean up passing the dialect as null versus explicitly adding the case to the
   // constructor.
   public RedshiftSource() {
-    super(DRIVER_CLASS, new RedshiftJdbcStreamingQueryConfiguration(), JdbcUtils.getDefaultSourceOperations());
+    super(DRIVER_CLASS, AdaptiveStreamingQueryConfig::new, JdbcUtils.getDefaultSourceOperations());
   }
 
   @Override
diff --git a/airbyte-integrations/connectors/source-salesforce/Dockerfile b/airbyte-integrations/connectors/source-salesforce/Dockerfile
index 9a78445a5d819d..14c1e7efa565f7 100644
--- a/airbyte-integrations/connectors/source-salesforce/Dockerfile
+++ b/airbyte-integrations/connectors/source-salesforce/Dockerfile
@@ -13,5 +13,5 @@ RUN pip install .
 
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=1.0.5
+LABEL io.airbyte.version=1.0.6
 LABEL io.airbyte.name=airbyte/source-salesforce
diff --git a/airbyte-integrations/connectors/source-salesforce/setup.py b/airbyte-integrations/connectors/source-salesforce/setup.py
index 1d16e4376bbae9..0f0d4635b22ed1 100644
--- a/airbyte-integrations/connectors/source-salesforce/setup.py
+++ b/airbyte-integrations/connectors/source-salesforce/setup.py
@@ -7,7 +7,7 @@
 
 MAIN_REQUIREMENTS = ["airbyte-cdk", "vcrpy==4.1.1", "pandas"]
 
-TEST_REQUIREMENTS = ["pytest~=6.1", "requests_mock", "source-acceptance-test", "pytest-timeout"]
+TEST_REQUIREMENTS = ["pytest~=6.1", "pytest-mock~=3.6", "requests_mock", "source-acceptance-test", "pytest-timeout"]
 
 setup(
     name="source_salesforce",
diff --git a/airbyte-integrations/connectors/source-salesforce/source_salesforce/streams.py b/airbyte-integrations/connectors/source-salesforce/source_salesforce/streams.py
index 05b23decdf6175..288ba776e9df1c 100644
--- a/airbyte-integrations/connectors/source-salesforce/source_salesforce/streams.py
+++ b/airbyte-integrations/connectors/source-salesforce/source_salesforce/streams.py
@@ -485,6 +485,7 @@ class Describe(Stream):
     Stream of sObjects' (Salesforce Objects) describe:
     https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/resources_sobject_describe.htm
     """
+
     name = "Describe"
     primary_key = "name"
 
diff --git a/airbyte-integrations/connectors/source-salesforce/unit_tests/api_test.py b/airbyte-integrations/connectors/source-salesforce/unit_tests/api_test.py
index 5b577b9bb2aa8a..cb81bf6e462668 100644
--- a/airbyte-integrations/connectors/source-salesforce/unit_tests/api_test.py
+++ b/airbyte-integrations/connectors/source-salesforce/unit_tests/api_test.py
@@ -24,6 +24,12 @@
 )
 
 
+@pytest.fixture(autouse=True)
+def time_sleep_mock(mocker):
+    time_mock = mocker.patch("time.sleep", lambda x: None)
+    yield time_mock
+
+
 def test_bulk_sync_creation_failed(stream_config, stream_api):
     stream: BulkIncrementalSalesforceStream = generate_stream("Account", stream_config, stream_api)
     with requests_mock.Mocker() as m:
@@ -482,7 +488,8 @@ def test_forwarding_sobject_options(stream_config, stream_names, catalog_stream_
                         "flag1": True,
                         "queryable": True,
                     }
-                    for stream_name in stream_names if stream_name != "Describe"
+                    for stream_name in stream_names
+                    if stream_name != "Describe"
                 ],
             },
         )
diff --git a/airbyte-integrations/connectors/source-salesforce/unit_tests/discovery_test.py b/airbyte-integrations/connectors/source-salesforce/unit_tests/discovery_test.py
index ed3192bfa095f2..0bc7ea48aee530 100644
--- a/airbyte-integrations/connectors/source-salesforce/unit_tests/discovery_test.py
+++ b/airbyte-integrations/connectors/source-salesforce/unit_tests/discovery_test.py
@@ -9,6 +9,12 @@
 from source_salesforce.exceptions import TypeSalesforceException
 
 
+@pytest.fixture(autouse=True)
+def time_sleep_mock(mocker):
+    time_mock = mocker.patch("time.sleep", lambda x: None)
+    yield time_mock
+
+
 @pytest.mark.parametrize(
     "streams_criteria,predicted_filtered_streams",
     [
diff --git a/airbyte-integrations/connectors/source-salesforce/unit_tests/test_memory.py b/airbyte-integrations/connectors/source-salesforce/unit_tests/test_memory.py
index 0d3dd27c303109..582f4c440c84a6 100644
--- a/airbyte-integrations/connectors/source-salesforce/unit_tests/test_memory.py
+++ b/airbyte-integrations/connectors/source-salesforce/unit_tests/test_memory.py
@@ -11,6 +11,12 @@
 from source_salesforce.streams import BulkIncrementalSalesforceStream
 
 
+@pytest.fixture(autouse=True)
+def time_sleep_mock(mocker):
+    time_mock = mocker.patch("time.sleep", lambda x: None)
+    yield time_mock
+
+
 @pytest.mark.parametrize(
     "n_records, first_size, first_peak",
     (
diff --git a/airbyte-integrations/connectors/source-scaffold-java-jdbc/src/main/java/io/airbyte/integrations/source/scaffold_java_jdbc/ScaffoldJavaJdbcSource.java b/airbyte-integrations/connectors/source-scaffold-java-jdbc/src/main/java/io/airbyte/integrations/source/scaffold_java_jdbc/ScaffoldJavaJdbcSource.java
index 1ff87d55ef86ee..1f8e82d00496f7 100644
--- a/airbyte-integrations/connectors/source-scaffold-java-jdbc/src/main/java/io/airbyte/integrations/source/scaffold_java_jdbc/ScaffoldJavaJdbcSource.java
+++ b/airbyte-integrations/connectors/source-scaffold-java-jdbc/src/main/java/io/airbyte/integrations/source/scaffold_java_jdbc/ScaffoldJavaJdbcSource.java
@@ -6,7 +6,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import io.airbyte.db.jdbc.JdbcUtils;
-import io.airbyte.db.jdbc.NoOpJdbcStreamingQueryConfiguration;
+import io.airbyte.db.jdbc.streaming.NoOpStreamingQueryConfig;
 import io.airbyte.integrations.base.IntegrationRunner;
 import io.airbyte.integrations.base.Source;
 import io.airbyte.integrations.source.jdbc.AbstractJdbcSource;
@@ -23,9 +23,9 @@ public class ScaffoldJavaJdbcSource extends AbstractJdbcSource<JDBCType> impleme
   static final String DRIVER_CLASS = "driver_name_here";
 
   public ScaffoldJavaJdbcSource() {
-    // By default, NoOpJdbcStreamingQueryConfiguration class is used, but may be updated. See example
-    // MssqlJdbcStreamingQueryConfiguration
-    super(DRIVER_CLASS, new NoOpJdbcStreamingQueryConfiguration(), JdbcUtils.getDefaultSourceOperations());
+    // By default, NoOpStreamingQueryConfig class is used. If the JDBC supports custom
+    // fetch size, change it to AdaptiveStreamingQueryConfig for better performance.
+    super(DRIVER_CLASS, NoOpStreamingQueryConfig::new, JdbcUtils.getDefaultSourceOperations());
   }
 
   // TODO The config is based on spec.json, update according to your DB
diff --git a/airbyte-integrations/connectors/source-slack/source_slack/spec.json b/airbyte-integrations/connectors/source-slack/source_slack/spec.json
index 5cd6b793f8c88a..7fce7bbe35427c 100644
--- a/airbyte-integrations/connectors/source-slack/source_slack/spec.json
+++ b/airbyte-integrations/connectors/source-slack/source_slack/spec.json
@@ -29,6 +29,10 @@
       "channel_filter": {
         "type": "array",
         "default": [],
+        "items": {
+          "type": "string",
+          "minLength": 0
+        },
         "title": "Channel name filter",
         "description": "A channel name list (without leading '#' char) which limit the channels from which you'd like to sync. Empty list means no filter.",
         "examples": ["channel_one", "channel_two"]
diff --git a/airbyte-integrations/connectors/source-smartsheets/Dockerfile b/airbyte-integrations/connectors/source-smartsheets/Dockerfile
index 7907f022cc86a0..8a86cdfb6699c7 100644
--- a/airbyte-integrations/connectors/source-smartsheets/Dockerfile
+++ b/airbyte-integrations/connectors/source-smartsheets/Dockerfile
@@ -14,5 +14,5 @@ COPY $CODE_PATH ./$CODE_PATH
 ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=0.1.9
+LABEL io.airbyte.version=0.1.11
 LABEL io.airbyte.name=airbyte/source-smartsheets
diff --git a/airbyte-integrations/connectors/source-smartsheets/acceptance-test-config.yml b/airbyte-integrations/connectors/source-smartsheets/acceptance-test-config.yml
index 54c4a0e8df865a..063f068e5caa91 100644
--- a/airbyte-integrations/connectors/source-smartsheets/acceptance-test-config.yml
+++ b/airbyte-integrations/connectors/source-smartsheets/acceptance-test-config.yml
@@ -12,6 +12,16 @@ tests:
   basic_read:
     - config_path: "secrets/config.json"
       configured_catalog_path: "integration_tests/configured_catalog.json"
+      empty_streams: []
+      expect_records:
+        path: "integration_tests/expected_records.txt"
+        extra_fields: yes
+        exact_order: yes
+        extra_records: no
   full_refresh:
     - config_path: "secrets/config.json"
       configured_catalog_path: "integration_tests/configured_catalog.json"
+  incremental:
+    - config_path: "secrets/config.json"
+      configured_catalog_path: "integration_tests/configured_catalog.json"
+      future_state_path: "integration_tests/abnormal_state.json"
diff --git a/airbyte-integrations/connectors/source-smartsheets/integration_tests/abnormal_state.json b/airbyte-integrations/connectors/source-smartsheets/integration_tests/abnormal_state.json
new file mode 100644
index 00000000000000..461ef6d45b5702
--- /dev/null
+++ b/airbyte-integrations/connectors/source-smartsheets/integration_tests/abnormal_state.json
@@ -0,0 +1,5 @@
+{
+  "aws_s3_sample": {
+    "modifiedAt": "2222-03-07T11:30:00+00:00"
+  }
+}
diff --git a/airbyte-integrations/connectors/source-smartsheets/integration_tests/configured_catalog.json b/airbyte-integrations/connectors/source-smartsheets/integration_tests/configured_catalog.json
index e263f7cae20890..f919a67cd985a0 100644
--- a/airbyte-integrations/connectors/source-smartsheets/integration_tests/configured_catalog.json
+++ b/airbyte-integrations/connectors/source-smartsheets/integration_tests/configured_catalog.json
@@ -13,7 +13,8 @@
             "gender": { "type": "string" },
             "ip_address": { "type": "string" },
             "primary_email": { "type": "string" },
-            "dob": { "type": "string", "format": "date" }
+            "dob": { "type": "string", "format": "date" },
+            "modifiedAt": { "type": "string", "format": "date-time" }
           }
         },
         "supported_sync_modes": ["full_refresh"]
diff --git a/airbyte-integrations/connectors/source-smartsheets/integration_tests/expected_records.txt b/airbyte-integrations/connectors/source-smartsheets/integration_tests/expected_records.txt
new file mode 100644
index 00000000000000..7d1e55999bc1e6
--- /dev/null
+++ b/airbyte-integrations/connectors/source-smartsheets/integration_tests/expected_records.txt
@@ -0,0 +1,100 @@
+{"stream": "aws_s3_sample", "data": {"id": "1.0", "first_name": "Joni", "last_name": "Watling", "email": "jwatling0@amazonaws.com", "gender": "Genderqueer", "ip_address": "195.50.216.194", "dob": "2020-11-23"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "2.0", "first_name": "Bernardo", "last_name": "Klaaassen", "email": "bklaaassen1@cbc.ca", "gender": "Polygender", "ip_address": "116.208.253.97", "dob": "2020-02-22"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "3.0", "first_name": "Drake", "last_name": "Bednell", "email": "dbednell2@theguardian.com", "gender": "Non-binary", "ip_address": "120.15.24.132", "dob": "2020-08-21"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "4.0", "first_name": "Alfreda", "last_name": "Brumbye", "email": "abrumbye3@howstuffworks.com", "gender": "Genderqueer", "ip_address": "64.22.217.122", "dob": "2020-12-29"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "5.0", "first_name": "Boycey", "last_name": "Brisson", "email": "bbrisson4@bizjournals.com", "gender": "Bigender", "ip_address": "59.220.127.45", "dob": "2020-06-26"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "6.0", "first_name": "Ursuline", "last_name": "Lintott", "email": "ulintott5@ow.ly", "gender": "Genderqueer", "ip_address": "47.253.138.238", "dob": "2020-07-26"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "7.0", "first_name": "Bettine", "last_name": "McKennan", "email": "bmckennan6@census.gov", "gender": "Bigender", "ip_address": "35.42.88.34", "dob": "2020-06-12"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "8.0", "first_name": "Eustace", "last_name": "Aaronsohn", "email": "eaaronsohn7@yale.edu", "gender": "Male", "ip_address": "84.153.189.160", "dob": "2020-12-14"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "9.0", "first_name": "Chrystel", "last_name": "Blum", "email": "cblum8@360.cn", "gender": "Bigender", "ip_address": "44.5.17.116", "dob": "2020-09-14"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "10.0", "first_name": "Kathryne", "last_name": "Cuncarr", "email": "kcuncarr9@hhs.gov", "gender": "Female", "ip_address": "50.63.175.212", "dob": "2020-06-24"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "11.0", "first_name": "Filmer", "last_name": "Ginni", "email": "fginnia@ucoz.com", "gender": "Genderfluid", "ip_address": "248.137.123.63", "dob": "2020-12-30"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "12.0", "first_name": "Anthiathia", "last_name": "Sketh", "email": "askethb@1688.com", "gender": "Female", "ip_address": "40.58.34.216", "dob": "2020-05-10"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "13.0", "first_name": "Pamella", "last_name": "Winterson", "email": "pwintersonc@biglobe.ne.jp", "gender": "Female", "ip_address": "173.8.175.104", "dob": "2020-06-28"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "14.0", "first_name": "Zuzana", "last_name": "Esmead", "email": "zesmeadd@bloglovin.com", "gender": "Polygender", "ip_address": "98.192.39.217", "dob": "2020-02-27"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "15.0", "first_name": "Donica", "last_name": "Jozaitis", "email": "djozaitise@amazon.de", "gender": "Female", "ip_address": "160.231.57.131", "dob": "2021-01-04"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "16.0", "first_name": "Pennie", "last_name": "Dunrige", "email": "pdunrigef@gravatar.com", "gender": "Non-binary", "ip_address": "208.255.160.56", "dob": "2020-03-01"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "17.0", "first_name": "Blanca", "last_name": "Allcroft", "email": "ballcroftg@furl.net", "gender": "Agender", "ip_address": "21.129.47.109", "dob": "2021-01-01"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "18.0", "first_name": "Webb", "last_name": "Simkins", "email": "wsimkinsh@qq.com", "gender": "Male", "ip_address": "2.125.148.89", "dob": "2020-06-16"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "19.0", "first_name": "Dorrie", "last_name": "Esser", "email": "desseri@rediff.com", "gender": "Female", "ip_address": "17.148.200.84", "dob": "2020-11-27"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "20.0", "first_name": "Kara", "last_name": "Gley", "email": "kgleyj@php.net", "gender": "Bigender", "ip_address": "117.130.134.124", "dob": "2020-12-02"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "21.0", "first_name": "Felicle", "last_name": "Roscrigg", "email": "froscriggk@java.com", "gender": "Female", "ip_address": "36.67.5.211", "dob": "2020-03-05"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "22.0", "first_name": "Carmine", "last_name": "Backshill", "email": "cbackshilll@addthis.com", "gender": "Polygender", "ip_address": "103.28.140.64", "dob": "2020-12-13"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "23.0", "first_name": "Helge", "last_name": "Kneeshaw", "email": "hkneeshawm@goo.gl", "gender": "Genderfluid", "ip_address": "154.154.89.226", "dob": "2020-07-15"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "24.0", "first_name": "Suzy", "last_name": "Ohm", "email": "sohmn@columbia.edu", "gender": "Bigender", "ip_address": "100.54.193.73", "dob": "2020-10-25"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "25.0", "first_name": "Bianka", "last_name": "Melmore", "email": "bmelmoreo@sohu.com", "gender": "Genderqueer", "ip_address": "38.63.204.171", "dob": "2020-11-02"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "26.0", "first_name": "Kim", "last_name": "Joust", "email": "kjoustp@sbwire.com", "gender": "Male", "ip_address": "87.176.59.210", "dob": "2020-12-27"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "27.0", "first_name": "Darrin", "last_name": "Warlawe", "email": "dwarlaweq@shinystat.com", "gender": "Male", "ip_address": "138.16.204.148", "dob": "2020-11-17"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "28.0", "first_name": "Edgard", "last_name": "Byfford", "email": "ebyffordr@spotify.com", "gender": "Polygender", "ip_address": "162.208.75.173", "dob": "2020-07-25"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "29.0", "first_name": "Dee", "last_name": "Bourgeois", "email": "dbourgeoiss@elegantthemes.com", "gender": "Polygender", "ip_address": "20.250.26.143", "dob": "2020-10-20"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "30.0", "first_name": "Fredrika", "last_name": "Ingry", "email": "fingryt@slashdot.org", "gender": "Non-binary", "ip_address": "255.214.102.98", "dob": "2020-04-03"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "31.0", "first_name": "Christie", "last_name": "Krier", "email": "ckrieru@aboutads.info", "gender": "Bigender", "ip_address": "29.122.167.180", "dob": "2020-09-24"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "32.0", "first_name": "Joshuah", "last_name": "Braffington", "email": "jbraffingtonv@foxnews.com", "gender": "Agender", "ip_address": "189.155.6.135", "dob": "2020-09-22"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "33.0", "first_name": "Bailie", "last_name": "Fossey", "email": "bfosseyw@flickr.com", "gender": "Agender", "ip_address": "129.166.4.82", "dob": "2020-05-30"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "34.0", "first_name": "Westley", "last_name": "Kupper", "email": "wkupperx@a8.net", "gender": "Agender", "ip_address": "12.125.54.217", "dob": "2020-04-10"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "35.0", "first_name": "Allie", "last_name": "Moogan", "email": "amoogany@jigsy.com", "gender": "Male", "ip_address": "158.225.146.105", "dob": "2020-12-24"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "36.0", "first_name": "Obadias", "last_name": "Stammers", "email": "ostammersz@shinystat.com", "gender": "Polygender", "ip_address": "210.226.250.161", "dob": "2021-01-01"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "37.0", "first_name": "Philippine", "last_name": "Barhems", "email": "pbarhems10@ted.com", "gender": "Male", "ip_address": "169.205.179.145", "dob": "2021-01-14"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "38.0", "first_name": "Theo", "last_name": "Messitt", "email": "tmessitt11@deviantart.com", "gender": "Male", "ip_address": "103.212.77.16", "dob": "2020-09-20"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "39.0", "first_name": "Roch", "last_name": "Cuphus", "email": "rcuphus12@pinterest.com", "gender": "Agender", "ip_address": "43.96.220.113", "dob": "2020-12-20"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "40.0", "first_name": "Sinclair", "last_name": "Chittey", "email": "schittey13@tamu.edu", "gender": "Genderfluid", "ip_address": "128.194.26.163", "dob": "2020-10-10"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "41.0", "first_name": "Eleonore", "last_name": "Guerrieri", "email": "eguerrieri14@typepad.com", "gender": "Genderfluid", "ip_address": "79.210.103.73", "dob": "2020-07-17"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "42.0", "first_name": "Elana", "last_name": "Secret", "email": "esecret15@mysql.com", "gender": "Polygender", "ip_address": "102.139.145.231", "dob": "2021-01-15"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "43.0", "first_name": "Dennie", "last_name": "Prati", "email": "dprati16@nytimes.com", "gender": "Genderqueer", "ip_address": "51.119.24.56", "dob": "2020-10-06"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "44.0", "first_name": "Roderick", "last_name": "Dand", "email": "rdand17@gmpg.org", "gender": "Genderqueer", "ip_address": "188.187.179.115", "dob": "2020-11-26"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "45.0", "first_name": "Lonnie", "last_name": "Grigolashvill", "email": "lgrigolashvill18@hhs.gov", "gender": "Non-binary", "ip_address": "96.104.221.230", "dob": "2020-05-05"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "46.0", "first_name": "Leslie", "last_name": "Iddins", "email": "liddins19@sbwire.com", "gender": "Genderqueer", "ip_address": "77.228.177.247", "dob": "2020-06-27"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "47.0", "first_name": "Conant", "last_name": "Gaishson", "email": "cgaishson1a@oakley.com", "gender": "Agender", "ip_address": "71.118.171.42", "dob": "2020-12-29"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "48.0", "first_name": "Aileen", "last_name": "Derrell", "email": "aderrell1b@amazonaws.com", "gender": "Genderfluid", "ip_address": "233.79.86.81", "dob": "2020-06-02"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "49.0", "first_name": "Heywood", "last_name": "Poulston", "email": "hpoulston1c@opera.com", "gender": "Genderqueer", "ip_address": "115.6.245.150", "dob": "2020-04-16"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "50.0", "first_name": "Neddie", "last_name": "Rickert", "email": "nrickert1d@omniture.com", "gender": "Polygender", "ip_address": "25.55.171.143", "dob": "2020-11-17"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "51.0", "first_name": "Ronny", "last_name": "Bondley", "email": "rbondley1e@loc.gov", "gender": "Genderqueer", "ip_address": "33.164.53.233", "dob": "2020-05-22"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "52.0", "first_name": "Filippa", "last_name": "McCuis", "email": "fmccuis1f@desdev.cn", "gender": "Bigender", "ip_address": "30.78.184.43", "dob": "2021-01-12"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "53.0", "first_name": "Kipper", "last_name": "Corton", "email": "kcorton1g@t.co", "gender": "Bigender", "ip_address": "177.22.101.164", "dob": "2021-01-23"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "54.0", "first_name": "Clementine", "last_name": "Callen", "email": "ccallen1h@storify.com", "gender": "Genderfluid", "ip_address": "122.40.201.54", "dob": "2020-06-03"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "55.0", "first_name": "Silvie", "last_name": "Royse", "email": "sroyse1i@mapquest.com", "gender": "Genderqueer", "ip_address": "38.145.193.0", "dob": "2020-06-27"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "56.0", "first_name": "Noble", "last_name": "Purslow", "email": "npurslow1j@redcross.org", "gender": "Non-binary", "ip_address": "119.89.26.248", "dob": "2020-11-21"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "57.0", "first_name": "Marjy", "last_name": "Gloves", "email": "mgloves1k@drupal.org", "gender": "Genderqueer", "ip_address": "250.108.63.170", "dob": "2020-07-24"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "58.0", "first_name": "Ellwood", "last_name": "Gullam", "email": "egullam1l@google.cn", "gender": "Genderfluid", "ip_address": "128.65.236.88", "dob": "2020-05-07"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "59.0", "first_name": "Adora", "last_name": "Povele", "email": "apovele1m@statcounter.com", "gender": "Genderfluid", "ip_address": "215.67.227.145", "dob": "2020-06-23"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "60.0", "first_name": "Miles", "last_name": "Zapatero", "email": "mzapatero1n@ezinearticles.com", "gender": "Non-binary", "ip_address": "212.252.221.177", "dob": "2020-05-22"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "61.0", "first_name": "Eddie", "last_name": "Menichi", "email": "emenichi1o@about.com", "gender": "Genderqueer", "ip_address": "138.77.252.222", "dob": "2020-02-11"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "62.0", "first_name": "Jakob", "last_name": "Showalter", "email": "jshowalter1p@cargocollective.com", "gender": "Genderfluid", "ip_address": "138.186.250.131", "dob": "2021-01-05"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "63.0", "first_name": "Zebadiah", "last_name": "Geratt", "email": "zgeratt1q@surveymonkey.com", "gender": "Genderfluid", "ip_address": "239.69.201.221", "dob": "2020-05-02"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "64.0", "first_name": "Carleton", "last_name": "Gayther", "email": "cgayther1r@si.edu", "gender": "Genderqueer", "ip_address": "138.237.56.77", "dob": "2020-03-09"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "65.0", "first_name": "Gwendolyn", "last_name": "Cotgrave", "email": "gcotgrave1s@dyndns.org", "gender": "Agender", "ip_address": "103.26.18.169", "dob": "2020-06-26"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "66.0", "first_name": "Nikki", "last_name": "Corry", "email": "ncorry1t@dedecms.com", "gender": "Female", "ip_address": "118.138.87.91", "dob": "2020-08-26"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "67.0", "first_name": "Kat", "last_name": "Figgins", "email": "kfiggins1u@jugem.jp", "gender": "Male", "ip_address": "202.202.94.181", "dob": "2020-06-19"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "68.0", "first_name": "Norean", "last_name": "Trendle", "email": "ntrendle1v@elpais.com", "gender": "Genderqueer", "ip_address": "134.89.22.248", "dob": "2020-08-24"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "69.0", "first_name": "Foster", "last_name": "Durker", "email": "fdurker1w@engadget.com", "gender": "Non-binary", "ip_address": "189.149.34.80", "dob": "2020-11-02"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "70.0", "first_name": "Rod", "last_name": "Jarnell", "email": "rjarnell1x@sphinn.com", "gender": "Genderfluid", "ip_address": "169.148.199.234", "dob": "2020-08-19"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "71.0", "first_name": "Lancelot", "last_name": "Plaxton", "email": "lplaxton1y@spiegel.de", "gender": "Agender", "ip_address": "81.194.71.38", "dob": "2020-09-07"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "72.0", "first_name": "Rudyard", "last_name": "Olliff", "email": "rolliff1z@bbb.org", "gender": "Agender", "ip_address": "113.39.154.178", "dob": "2021-01-07"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "73.0", "first_name": "Shelley", "last_name": "Lipprose", "email": "slipprose20@engadget.com", "gender": "Polygender", "ip_address": "117.254.24.20", "dob": "2021-01-03"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "74.0", "first_name": "Prudi", "last_name": "Boichat", "email": "pboichat21@cam.ac.uk", "gender": "Agender", "ip_address": "99.169.9.122", "dob": "2020-08-25"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "75.0", "first_name": "Denny", "last_name": "Bollum", "email": "dbollum22@skyrock.com", "gender": "Bigender", "ip_address": "77.112.28.180", "dob": "2020-07-31"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "76.0", "first_name": "Lucila", "last_name": "Charteris", "email": "lcharteris23@linkedin.com", "gender": "Genderfluid", "ip_address": "194.161.40.83", "dob": "2020-05-17"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "77.0", "first_name": "Marrissa", "last_name": "Wurz", "email": "mwurz24@pinterest.com", "gender": "Agender", "ip_address": "72.219.43.46", "dob": "2020-09-04"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "78.0", "first_name": "Teresina", "last_name": "Micklewicz", "email": "tmicklewicz25@goo.ne.jp", "gender": "Genderqueer", "ip_address": "214.116.247.204", "dob": "2020-09-13"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "79.0", "first_name": "Idette", "last_name": "Ilieve", "email": "iilieve26@mozilla.com", "gender": "Bigender", "ip_address": "25.25.28.17", "dob": "2020-09-21"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "80.0", "first_name": "Noemi", "last_name": "Lempenny", "email": "nlempenny27@jugem.jp", "gender": "Bigender", "ip_address": "194.139.183.130", "dob": "2020-09-01"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "81.0", "first_name": "Faye", "last_name": "Ashbee", "email": "fashbee28@google.com", "gender": "Bigender", "ip_address": "191.149.120.198", "dob": "2020-03-12"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "82.0", "first_name": "Olly", "last_name": "Siaspinski", "email": "osiaspinski29@amazonaws.com", "gender": "Polygender", "ip_address": "150.134.136.240", "dob": "2020-07-12"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "83.0", "first_name": "Marji", "last_name": "Dahlen", "email": "mdahlen2a@zdnet.com", "gender": "Bigender", "ip_address": "185.226.214.79", "dob": "2020-11-28"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "84.0", "first_name": "Aubine", "last_name": "Genner", "email": "agenner2b@chronoengine.com", "gender": "Genderfluid", "ip_address": "109.51.123.153", "dob": "2020-03-28"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "85.0", "first_name": "Dix", "last_name": "Civitillo", "email": "dcivitillo2c@bluehost.com", "gender": "Female", "ip_address": "112.89.157.163", "dob": "2020-05-30"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "86.0", "first_name": "Birk", "last_name": "Mussolini", "email": "bmussolini2d@wikimedia.org", "gender": "Agender", "ip_address": "235.49.78.159", "dob": "2020-03-05"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "87.0", "first_name": "Lenci", "last_name": "Wager", "email": "lwager2e@fda.gov", "gender": "Agender", "ip_address": "113.145.228.184", "dob": "2020-03-27"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "88.0", "first_name": "Avrit", "last_name": "Yosifov", "email": "ayosifov2f@umn.edu", "gender": "Male", "ip_address": "112.171.167.81", "dob": "2021-01-18"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "89.0", "first_name": "Honor", "last_name": "McMorran", "email": "hmcmorran2g@bbc.co.uk", "gender": "Genderqueer", "ip_address": "11.179.26.90", "dob": "2020-04-07"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "90.0", "first_name": "Lilah", "last_name": "Carnall", "email": "lcarnall2h@barnesandnoble.com", "gender": "Polygender", "ip_address": "51.194.48.153", "dob": "2020-06-13"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "91.0", "first_name": "Daffie", "last_name": "Cheke", "email": "dcheke2i@theatlantic.com", "gender": "Polygender", "ip_address": "158.53.238.38", "dob": "2020-11-12"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "92.0", "first_name": "Ariel", "last_name": "Minor", "email": "aminor2j@blogger.com", "gender": "Polygender", "ip_address": "29.0.88.144", "dob": "2020-07-16"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "93.0", "first_name": "Kenna", "last_name": "Spraggon", "email": "kspraggon2k@google.fr", "gender": "Agender", "ip_address": "139.245.147.77", "dob": "2020-11-15"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "94.0", "first_name": "Evelyn", "last_name": "Oleshunin", "email": "eoleshunin2l@istockphoto.com", "gender": "Genderqueer", "ip_address": "26.117.119.59", "dob": "2020-08-11"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "95.0", "first_name": "Marcel", "last_name": "Kuhnt", "email": "mkuhnt2m@google.com.au", "gender": "Genderfluid", "ip_address": "84.158.205.130", "dob": "2020-08-22"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "96.0", "first_name": "Wendye", "last_name": "Wigelsworth", "email": "wwigelsworth2n@webs.com", "gender": "Polygender", "ip_address": "241.71.79.173", "dob": "2020-02-26"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "97.0", "first_name": "Nonie", "last_name": "Cadany", "email": "ncadany2o@cdbaby.com", "gender": "Female", "ip_address": "87.132.223.229", "dob": "2020-05-30"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "98.0", "first_name": "Arthur", "last_name": "Norsister", "email": "anorsister2p@csmonitor.com", "gender": "Male", "ip_address": "21.50.95.6", "dob": "2020-05-13"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "99.0", "first_name": "Auria", "last_name": "Haryngton", "email": "aharyngton2q@mapquest.com", "gender": "Non-binary", "ip_address": "246.28.159.95", "dob": "2020-06-28"}, "emitted_at": 1649842201000}
+{"stream": "aws_s3_sample", "data": {"id": "100.0", "first_name": "Phelia", "last_name": "Simmig", "email": "psimmig2r@example.com", "gender": "Agender", "ip_address": "205.35.103.161", "dob": "2020-04-05"}, "emitted_at": 1649842201000}
\ No newline at end of file
diff --git a/airbyte-integrations/connectors/source-smartsheets/source_smartsheets/sheet.py b/airbyte-integrations/connectors/source-smartsheets/source_smartsheets/sheet.py
new file mode 100644
index 00000000000000..5708492259375f
--- /dev/null
+++ b/airbyte-integrations/connectors/source-smartsheets/source_smartsheets/sheet.py
@@ -0,0 +1,92 @@
+#
+# Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+#
+
+import logging
+from functools import cached_property
+from typing import Any, Dict, Iterable, Mapping, Optional, Tuple
+
+import smartsheet
+
+
+class SmartSheetAPIWrapper:
+    def __init__(self, config: Mapping[str, Any]):
+        self._spreadsheet_id = config["spreadsheet_id"]
+        self._access_token = config["access_token"]
+        api_client = smartsheet.Smartsheet(self._access_token)
+        api_client.errors_as_exceptions(True)
+        # each call to `Sheets` makes a new instance, so we save it here to make no more new objects
+        self._get_sheet = api_client.Sheets.get_sheet
+        self._data = None
+
+    def _fetch_sheet(self, from_dt: Optional[str] = None) -> None:
+        kwargs = {"rows_modified_since": from_dt}
+        if not from_dt:
+            kwargs["page_size"] = 1
+        self._data = self._get_sheet(self._spreadsheet_id, **kwargs)
+
+    @staticmethod
+    def _column_to_property(column_type: str) -> Dict[str, any]:
+        type_mapping = {
+            "TEXT_NUMBER": {"type": "string"},
+            "DATE": {"type": "string", "format": "date"},
+            "DATETIME": {"type": "string", "format": "date-time"},
+        }
+        return type_mapping.get(column_type, {"type": "string"})
+
+    def _construct_record(self, row: smartsheet.models.Row) -> Dict[str, str]:
+        values_column_map = {cell.column_id: str(cell.value or "") for cell in row.cells}
+        record = {column.title: values_column_map[column.id] for column in self.data.columns}
+        record["modifiedAt"] = row.modified_at.isoformat()
+        return record
+
+    @property
+    def data(self) -> smartsheet.models.Row:
+        if not self._data:
+            self._fetch_sheet()
+        return self._data
+
+    @property
+    def name(self) -> str:
+        return self.data.name
+
+    @property
+    def row_count(self) -> int:
+        return len(self.data.rows)
+
+    @cached_property
+    def primary_key(self) -> str:
+        for column in self.data.columns:
+            if column.primary:
+                return column.title
+
+    @cached_property
+    def json_schema(self) -> Dict[str, Any]:
+        column_info = {column.title: self._column_to_property(column.type.value) for column in self.data.columns}
+        column_info["modifiedAt"] = {"type": "string", "format": "date-time"}  # add cursor field explicitly
+        json_schema = {
+            "$schema": "http://json-schema.org/draft-07/schema#",
+            "type": "object",
+            "properties": column_info,
+        }
+        return json_schema
+
+    def read_records(self, from_dt: str) -> Iterable[Dict[str, str]]:
+        self._fetch_sheet(from_dt)
+        for row in self.data.rows:
+            yield self._construct_record(row)
+
+    def check_connection(self, logger: logging.Logger) -> Tuple[bool, Optional[str]]:
+        try:
+            _ = self.data
+        except smartsheet.exceptions.ApiError as e:
+            err = e.error.result
+            code = 404 if err.code == 1006 else err.code
+            reason = f"{err.name}: {code} - {err.message} | Check your spreadsheet ID."
+            logger.error(reason)
+            return False, reason
+        except Exception as e:
+            reason = str(e)
+            logger.error(reason)
+            return False, reason
+        return True, None
diff --git a/airbyte-integrations/connectors/source-smartsheets/source_smartsheets/source.py b/airbyte-integrations/connectors/source-smartsheets/source_smartsheets/source.py
index 542cdb04210353..3bce5c71f7e4b0 100644
--- a/airbyte-integrations/connectors/source-smartsheets/source_smartsheets/source.py
+++ b/airbyte-integrations/connectors/source-smartsheets/source_smartsheets/source.py
@@ -2,120 +2,21 @@
 # Copyright (c) 2021 Airbyte, Inc., all rights reserved.
 #
 
+import logging
+from typing import Any, List, Mapping, Tuple
 
-import json
-from datetime import datetime
-from typing import Dict, Generator, List
+from airbyte_cdk.sources import AbstractSource
+from airbyte_cdk.sources.streams import Stream
 
-import smartsheet
-from airbyte_cdk import AirbyteLogger
-from airbyte_cdk.models import (
-    AirbyteCatalog,
-    AirbyteConnectionStatus,
-    AirbyteMessage,
-    AirbyteRecordMessage,
-    AirbyteStream,
-    ConfiguredAirbyteCatalog,
-    Status,
-    Type,
-)
-from airbyte_cdk.sources import Source
+from .sheet import SmartSheetAPIWrapper
+from .streams import SmartsheetStream
 
 
-def get_prop(col_type: str) -> Dict[str, any]:
-    props = {
-        "TEXT_NUMBER": {"type": "string"},
-        "DATE": {"type": "string", "format": "date"},
-        "DATETIME": {"type": "string", "format": "date-time"},
-    }
-    return props.get(col_type, {"type": "string"})
+class SourceSmartsheets(AbstractSource):
+    def check_connection(self, logger: logging.Logger, config: Mapping[str, Any]) -> Tuple[bool, any]:
+        sheet = SmartSheetAPIWrapper(config)
+        return sheet.check_connection(logger)
 
-
-def construct_record(sheet_columns: List[Dict], row_cells: List[Dict]) -> Dict:
-    # convert all data to string as it is only expected format in schema
-    values_column_map = {cell["columnId"]: str(cell.get("value", "")) for cell in row_cells}
-    return {column["title"]: values_column_map[column["id"]] for column in sheet_columns}
-
-
-def get_json_schema(sheet_columns: List[Dict]) -> Dict:
-    column_info = {column["title"]: get_prop(column["type"]) for column in sheet_columns}
-    json_schema = {
-        "$schema": "http://json-schema.org/draft-07/schema#",
-        "type": "object",
-        "properties": column_info,
-    }
-    return json_schema
-
-
-class SourceSmartsheets(Source):
-    def check(self, logger: AirbyteLogger, config: json) -> AirbyteConnectionStatus:
-        try:
-            access_token = config["access_token"]
-            spreadsheet_id = config["spreadsheet_id"]
-
-            smartsheet_client = smartsheet.Smartsheet(access_token)
-            smartsheet_client.errors_as_exceptions(True)
-            smartsheet_client.Sheets.get_sheet(spreadsheet_id)
-
-            return AirbyteConnectionStatus(status=Status.SUCCEEDED)
-        except Exception as e:
-            if isinstance(e, smartsheet.exceptions.ApiError):
-                err = e.error.result
-                code = 404 if err.code == 1006 else err.code
-                reason = f"{err.name}: {code} - {err.message} | Check your spreadsheet ID."
-            else:
-                reason = str(e)
-            logger.error(reason)
-        return AirbyteConnectionStatus(status=Status.FAILED)
-
-    def discover(self, logger: AirbyteLogger, config: json) -> AirbyteCatalog:
-        access_token = config["access_token"]
-        spreadsheet_id = config["spreadsheet_id"]
-        streams = []
-
-        smartsheet_client = smartsheet.Smartsheet(access_token)
-        try:
-            sheet = smartsheet_client.Sheets.get_sheet(spreadsheet_id)
-            sheet = json.loads(str(sheet))  # make it subscriptable
-            sheet_json_schema = get_json_schema(sheet["columns"])
-            logger.info(f"Running discovery on sheet: {sheet['name']} with {spreadsheet_id}")
-
-            stream = AirbyteStream(name=sheet["name"], json_schema=sheet_json_schema)
-            stream.supported_sync_modes = ["full_refresh"]
-            streams.append(stream)
-
-        except Exception as e:
-            raise Exception(f"Could not run discovery: {str(e)}")
-
-        return AirbyteCatalog(streams=streams)
-
-    def read(
-        self, logger: AirbyteLogger, config: json, catalog: ConfiguredAirbyteCatalog, state: Dict[str, any]
-    ) -> Generator[AirbyteMessage, None, None]:
-
-        access_token = config["access_token"]
-        spreadsheet_id = config["spreadsheet_id"]
-        smartsheet_client = smartsheet.Smartsheet(access_token)
-
-        for configured_stream in catalog.streams:
-            stream = configured_stream.stream
-            try:
-                sheet = smartsheet_client.Sheets.get_sheet(spreadsheet_id)
-                sheet = json.loads(str(sheet))  # make it subscriptable
-                logger.info(f"Starting syncing spreadsheet {sheet['name']}")
-                logger.info(f"Row count: {sheet['totalRowCount']}")
-
-                for row in sheet["rows"]:
-                    try:
-                        record = construct_record(sheet["columns"], row["cells"])
-                        yield AirbyteMessage(
-                            type=Type.RECORD,
-                            record=AirbyteRecordMessage(stream=stream.name, data=record, emitted_at=int(datetime.now().timestamp()) * 1000),
-                        )
-                    except Exception as e:
-                        logger.error(f"Unable to encode row into an AirbyteMessage with the following error: {e}")
-
-            except Exception as e:
-                logger.error(f"Could not read smartsheet: {stream.name}")
-                raise e
-        logger.info(f"Finished syncing spreadsheet with ID: {spreadsheet_id}")
+    def streams(self, config: Mapping[str, Any]) -> List["Stream"]:
+        sheet = SmartSheetAPIWrapper(config)
+        return [SmartsheetStream(sheet, config)]
diff --git a/airbyte-integrations/connectors/source-smartsheets/source_smartsheets/spec.json b/airbyte-integrations/connectors/source-smartsheets/source_smartsheets/spec.json
index 57876a9a81a15f..5e027cac477e95 100644
--- a/airbyte-integrations/connectors/source-smartsheets/source_smartsheets/spec.json
+++ b/airbyte-integrations/connectors/source-smartsheets/source_smartsheets/spec.json
@@ -11,12 +11,23 @@
         "title": "Access Token",
         "description": "The Access Token for making authenticated requests. Find in the main menu: Account > Apps & Integrations > API Access",
         "type": "string",
+        "order": 0,
         "airbyte_secret": true
       },
       "spreadsheet_id": {
         "title": "Sheet ID",
         "description": "The spreadsheet ID. Find in the spreadsheet menu: File > Properties",
-        "type": "string"
+        "type": "string",
+        "order": 1
+      },
+      "start_datetime": {
+        "title": "Start Datetime (Optional)",
+        "type": "string",
+        "examples": ["2000-01-01T13:00:00", "2000-01-01T13:00:00-07:00"],
+        "description": "ISO 8601, for instance: `YYYY-MM-DDTHH:MM:SS`, `YYYY-MM-DDTHH:MM:SS+HH:MM`",
+        "format": "date-time",
+        "default": "2020-01-01T00:00:00+00:00",
+        "order": 2
       }
     }
   },
diff --git a/airbyte-integrations/connectors/source-smartsheets/source_smartsheets/streams.py b/airbyte-integrations/connectors/source-smartsheets/source_smartsheets/streams.py
new file mode 100644
index 00000000000000..5a589392376092
--- /dev/null
+++ b/airbyte-integrations/connectors/source-smartsheets/source_smartsheets/streams.py
@@ -0,0 +1,58 @@
+#
+# Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+#
+
+import datetime
+from typing import Any, Dict, Iterable, List, Mapping
+
+from airbyte_cdk.models import SyncMode
+from airbyte_cdk.sources.streams import Stream
+from source_smartsheets.sheet import SmartSheetAPIWrapper
+
+
+class SmartsheetStream(Stream):
+    cursor_field = "modifiedAt"
+
+    def __init__(self, smartsheet: SmartSheetAPIWrapper, config: Mapping[str, Any]):
+        self.smartsheet = smartsheet
+        self._state = {}
+        self._config = config
+        self._start_datetime = self._config.get("start_datetime") or "2020-01-01T00:00:00+00:00"
+
+    @property
+    def primary_key(self) -> str:
+        return self.smartsheet.primary_key
+
+    def get_json_schema(self) -> Dict[str, Any]:
+        return self.smartsheet.json_schema
+
+    @property
+    def name(self) -> str:
+        return self.smartsheet.name
+
+    @property
+    def state(self) -> Mapping[str, Any]:
+        if not self._state:
+            self._state = {self.cursor_field: self._start_datetime}
+        return self._state
+
+    @state.setter
+    def state(self, value: Mapping[str, Any]):
+        self._state = value
+
+    def read_records(
+        self,
+        sync_mode: SyncMode,
+        cursor_field: List[str] = None,
+        stream_slice: Mapping[str, Any] = None,
+        stream_state: Mapping[str, Any] = None,
+    ) -> Iterable[Mapping[str, Any]]:
+        def iso_dt(src):
+            return datetime.datetime.fromisoformat(src)
+
+        for record in self.smartsheet.read_records(self.state[self.cursor_field]):
+            current_cursor_value = iso_dt(self.state[self.cursor_field])
+            latest_cursor_value = iso_dt(record[self.cursor_field])
+            new_cursor_value = max(latest_cursor_value, current_cursor_value)
+            self.state = {self.cursor_field: new_cursor_value.isoformat("T", "seconds")}
+            yield record
diff --git a/airbyte-integrations/connectors/source-smartsheets/unit_tests/conftest.py b/airbyte-integrations/connectors/source-smartsheets/unit_tests/conftest.py
new file mode 100644
index 00000000000000..e168f2fe831c51
--- /dev/null
+++ b/airbyte-integrations/connectors/source-smartsheets/unit_tests/conftest.py
@@ -0,0 +1,34 @@
+#
+# Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+#
+
+import json
+from pathlib import Path
+from unittest.mock import Mock
+
+import pytest
+from smartsheet.models import Sheet
+
+HERE = Path(__file__).parent.absolute()
+
+
+@pytest.fixture
+def response_mock():
+    with open(HERE / "response.json") as json_file:
+        return json.loads(json_file.read())
+
+
+@pytest.fixture
+def config():
+    return {"spreadsheet_id": "id", "access_token": "token"}
+
+
+@pytest.fixture
+def get_sheet_mocker(mocker, response_mock):
+    def _mocker(api_wrapper, data=None):
+        sheet_obj = Sheet(props=response_mock, base_obj=api_wrapper)
+        get_sheet_mock = Mock(return_value=sheet_obj)
+        mocker.patch.object(api_wrapper, "_get_sheet", data or get_sheet_mock)
+        return get_sheet_mock, sheet_obj
+
+    return _mocker
diff --git a/airbyte-integrations/connectors/source-smartsheets/unit_tests/response.json b/airbyte-integrations/connectors/source-smartsheets/unit_tests/response.json
new file mode 100644
index 00000000000000..99e8122ceef2df
--- /dev/null
+++ b/airbyte-integrations/connectors/source-smartsheets/unit_tests/response.json
@@ -0,0 +1,251 @@
+{
+  "accessLevel": "OWNER",
+  "columns": [
+    {
+      "id": 1101932201830276,
+      "index": 0,
+      "primary": true,
+      "title": "id",
+      "type": "TEXT_NUMBER",
+      "validation": false,
+      "version": 0,
+      "width": 51
+    },
+    {
+      "id": 5605531829200772,
+      "index": 1,
+      "title": "first_name",
+      "type": "TEXT_NUMBER",
+      "validation": false,
+      "version": 0,
+      "width": 275
+    },
+    {
+      "id": 3353732015515524,
+      "index": 2,
+      "title": "last_name",
+      "type": "TEXT_NUMBER",
+      "validation": false,
+      "version": 0,
+      "width": 224
+    },
+    {
+      "id": 7857331642886020,
+      "index": 3,
+      "title": "email",
+      "type": "TEXT_NUMBER",
+      "validation": false,
+      "version": 0,
+      "width": 231
+    },
+    {
+      "id": 2227832108672900,
+      "index": 4,
+      "options": [
+        "Agender",
+        "Bigender",
+        "Female",
+        "Genderfluid",
+        "Genderqueer",
+        "Male",
+        "Non-binary",
+        "Polygender"
+      ],
+      "title": "gender",
+      "type": "PICKLIST",
+      "validation": false,
+      "version": 0,
+      "width": 193
+    },
+    {
+      "id": 6731431736043396,
+      "index": 5,
+      "title": "ip_address",
+      "type": "TEXT_NUMBER",
+      "validation": false,
+      "version": 0,
+      "width": 206
+    },
+    {
+      "id": 4479631922358148,
+      "index": 6,
+      "title": "dob",
+      "type": "DATE",
+      "validation": false,
+      "version": 0,
+      "width": 201
+    }
+  ],
+  "createdAt": "2021-08-27T11:36:41+00:00",
+  "dependenciesEnabled": false,
+  "effectiveAttachmentOptions": [
+    "GOOGLE_DRIVE",
+    "DROPBOX",
+    "ONEDRIVE",
+    "LINK",
+    "EVERNOTE",
+    "BOX_COM",
+    "FILE",
+    "EGNYTE"
+  ],
+  "ganttEnabled": false,
+  "hasSummaryFields": false,
+  "id": 679252988323716,
+  "modifiedAt": "2022-04-13T06:50:10+00:00",
+  "name": "aws_s3_sample",
+  "permalink": "https://app.smartsheet.com/sheets/v7vHw7qHJChcvfHQ8j3xJpG8H82Fh39Rc9PRGvQ1",
+  "resourceManagementEnabled": false,
+  "rows": [
+    {
+      "cells": [
+        { "columnId": 1101932201830276, "displayValue": "1", "value": 1.0 },
+        {
+          "columnId": 5605531829200772,
+          "displayValue": "Joni",
+          "value": "Joni"
+        },
+        {
+          "columnId": 3353732015515524,
+          "displayValue": "Watling",
+          "value": "Watling"
+        },
+        {
+          "columnId": 7857331642886020,
+          "displayValue": "jwatling0@amazonaws.com",
+          "value": "jwatling0@amazonaws.com"
+        },
+        {
+          "columnId": 2227832108672900,
+          "displayValue": "Genderqueer",
+          "value": "Genderqueer"
+        },
+        {
+          "columnId": 6731431736043396,
+          "displayValue": "195.50.216.194",
+          "value": "195.50.216.194"
+        },
+        { "columnId": 4479631922358148, "value": "2020-11-23" }
+      ],
+      "createdAt": "2021-08-27T11:36:41+00:00",
+      "expanded": true,
+      "id": 3201922565072772,
+      "modifiedAt": "2021-08-27T11:36:41+00:00",
+      "rowNumber": 1
+    },
+    {
+      "cells": [
+        { "columnId": 1101932201830276, "displayValue": "2", "value": 2.0 },
+        {
+          "columnId": 5605531829200772,
+          "displayValue": "Bernardo",
+          "value": "Bernardo"
+        },
+        {
+          "columnId": 3353732015515524,
+          "displayValue": "Klaaassen",
+          "value": "Klaaassen"
+        },
+        {
+          "columnId": 7857331642886020,
+          "displayValue": "bklaaassen1@cbc.ca",
+          "value": "bklaaassen1@cbc.ca"
+        },
+        {
+          "columnId": 2227832108672900,
+          "displayValue": "Polygender",
+          "value": "Polygender"
+        },
+        {
+          "columnId": 6731431736043396,
+          "displayValue": "116.208.253.97",
+          "value": "116.208.253.97"
+        },
+        { "columnId": 4479631922358148, "value": "2020-02-22" }
+      ],
+      "createdAt": "2021-08-27T11:36:41+00:00",
+      "expanded": true,
+      "id": 7705522192443268,
+      "modifiedAt": "2021-08-27T11:36:41+00:00",
+      "rowNumber": 2,
+      "siblingId": 3201922565072772
+    },
+    {
+      "cells": [
+        { "columnId": 1101932201830276, "displayValue": "3", "value": 3.0 },
+        {
+          "columnId": 5605531829200772,
+          "displayValue": "Drake",
+          "value": "Drake"
+        },
+        {
+          "columnId": 3353732015515524,
+          "displayValue": "Bednell",
+          "value": "Bednell"
+        },
+        {
+          "columnId": 7857331642886020,
+          "displayValue": "dbednell2@theguardian.com",
+          "value": "dbednell2@theguardian.com"
+        },
+        {
+          "columnId": 2227832108672900,
+          "displayValue": "Non-binary",
+          "value": "Non-binary"
+        },
+        {
+          "columnId": 6731431736043396,
+          "displayValue": "120.15.24.132",
+          "value": "120.15.24.132"
+        },
+        { "columnId": 4479631922358148, "value": "2020-08-21" }
+      ],
+      "createdAt": "2021-08-27T11:36:41+00:00",
+      "expanded": true,
+      "id": 2076022658230148,
+      "modifiedAt": "2021-08-27T11:36:41+00:00",
+      "rowNumber": 3,
+      "siblingId": 7705522192443268
+    },
+    {
+      "cells": [
+        { "columnId": 1101932201830276, "displayValue": "4", "value": 4.0 },
+        {
+          "columnId": 5605531829200772,
+          "displayValue": "Alfreda",
+          "value": "Alfreda"
+        },
+        {
+          "columnId": 3353732015515524,
+          "displayValue": "Brumbye",
+          "value": "Brumbye"
+        },
+        {
+          "columnId": 7857331642886020,
+          "displayValue": "abrumbye3@howstuffworks.com",
+          "value": "abrumbye3@howstuffworks.com"
+        },
+        {
+          "columnId": 2227832108672900,
+          "displayValue": "Genderqueer",
+          "value": "Genderqueer"
+        },
+        {
+          "columnId": 6731431736043396,
+          "displayValue": "64.22.217.122",
+          "value": "64.22.217.122"
+        },
+        { "columnId": 4479631922358148, "value": "2020-12-29" }
+      ],
+      "createdAt": "2021-08-27T11:36:41+00:00",
+      "expanded": true,
+      "id": 6579622285600644,
+      "modifiedAt": "2021-08-27T11:36:41+00:00",
+      "rowNumber": 4,
+      "siblingId": 2076022658230148
+    }
+  ],
+  "totalRowCount": 100,
+  "userPermissions": { "summaryPermissions": "ADMIN" },
+  "userSettings": { "criticalPathEnabled": false, "displaySummaryTasks": true },
+  "version": 9
+}
diff --git a/airbyte-integrations/connectors/source-smartsheets/unit_tests/test_sheets.py b/airbyte-integrations/connectors/source-smartsheets/unit_tests/test_sheets.py
new file mode 100644
index 00000000000000..662c7b24882b50
--- /dev/null
+++ b/airbyte-integrations/connectors/source-smartsheets/unit_tests/test_sheets.py
@@ -0,0 +1,119 @@
+#
+# Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+#
+
+import logging
+from itertools import permutations
+from unittest.mock import ANY, Mock
+
+import pytest
+from smartsheet.exceptions import ApiError
+from source_smartsheets.sheet import SmartSheetAPIWrapper
+
+
+def test_fetch_sheet(config, get_sheet_mocker):
+    spreadsheet_id = config["spreadsheet_id"]
+    sheet = SmartSheetAPIWrapper(config)
+    mock, resp = get_sheet_mocker(sheet)
+
+    sheet._fetch_sheet()
+    mock.assert_called_once_with(spreadsheet_id, rows_modified_since=None, page_size=1)
+    assert sheet.data == resp
+
+    sheet._fetch_sheet(from_dt="2022-03-04T00:00:00Z")
+    mock.assert_called_with(spreadsheet_id, rows_modified_since="2022-03-04T00:00:00Z")
+    assert sheet.data == resp
+
+
+def test_properties(config, get_sheet_mocker):
+    sheet = SmartSheetAPIWrapper(config)
+    _, resp = get_sheet_mocker(sheet)
+    assert sheet.data == resp
+    assert sheet.name == "aws_s3_sample"
+    assert sheet.row_count == 4
+    assert sheet.primary_key == "id"
+
+
+@pytest.mark.parametrize(
+    ("column_type", "expected_schema"),
+    (
+        ("TEXT_NUMBER", {"type": "string"}),
+        ("DATE", {"type": "string", "format": "date"}),
+        ("DATETIME", {"type": "string", "format": "date-time"}),
+        ("DURATION", {"type": "string"}),
+    ),
+)
+def test_column_types(config, column_type, expected_schema):
+    sheet = SmartSheetAPIWrapper(config)
+    assert sheet._column_to_property(column_type) == expected_schema
+
+
+def test_json_schema(config, get_sheet_mocker):
+    sheet = SmartSheetAPIWrapper(config)
+    _ = get_sheet_mocker(sheet)
+    json_schema = sheet.json_schema
+    assert json_schema["$schema"] == "http://json-schema.org/draft-07/schema#"
+    assert json_schema["type"] == "object"
+    assert "properties" in json_schema
+    assert "modifiedAt" in json_schema["properties"]
+
+
+def _make_api_error(code, message, name):
+    result_mock = Mock(code=code, message=message)
+    result_mock.name = name
+    return ApiError(error=Mock(result=result_mock))
+
+
+@pytest.mark.parametrize(
+    ("side_effect", "expected_error"),
+    (
+        (Exception("Internal Server Error"), "Internal Server Error"),
+        (
+            _make_api_error(code=1006, message="Resource not found", name="Not Found"),
+            "Not Found: 404 - Resource not found | Check your spreadsheet ID.",
+        ),
+        (
+            _make_api_error(code=4003, message="Too many requests", name="Limit reached"),
+            "Limit reached: 4003 - Too many requests | Check your spreadsheet ID.",
+        ),
+    ),
+)
+def test_check_connection_fail(mocker, config, side_effect, expected_error):
+    sheet = SmartSheetAPIWrapper(config)
+    with mocker.patch.object(sheet, "_get_sheet", side_effect=side_effect):
+        status, error = sheet.check_connection(logger=logging.getLogger())
+    assert error == expected_error
+    assert status is False
+
+
+def test_check_connection_success(mocker, config):
+    sheet = SmartSheetAPIWrapper(config)
+    with mocker.patch.object(sheet, "_get_sheet"):
+        status, error = sheet.check_connection(logger=logging.getLogger())
+    assert error is None
+    assert status is True
+
+
+_columns = [
+    Mock(id="1101932201830276", title="id", type="TEXT_NUMBER"),
+    Mock(id="5605531829200772", title="first_name", type="TEXT_NUMBER"),
+    Mock(id="3353732015515524", title="last_name", type="TEXT_NUMBER"),
+]
+
+
+_cells = [
+    Mock(column_id="1101932201830276", value="11"),
+    Mock(column_id="5605531829200772", value="Leonardo"),
+    Mock(column_id="3353732015515524", value="Dicaprio"),
+]
+
+
+@pytest.mark.parametrize(("row", "columns"), (*((perm, _columns) for perm in permutations(_cells)), ([], _columns), ([], [])))
+def test_different_cell_order_produces_same_result(get_sheet_mocker, config, row, columns):
+    sheet = SmartSheetAPIWrapper(config)
+    sheet_mock = Mock(rows=[Mock(cells=row)] if row else [], columns=columns)
+    get_sheet_mocker(sheet, data=Mock(return_value=sheet_mock))
+
+    records = sheet.read_records(from_dt="2020-01-01T00:00:00Z")
+    expected_records = [] if not row else [{"id": "11", "first_name": "Leonardo", "last_name": "Dicaprio", "modifiedAt": ANY}]
+    assert list(records) == expected_records
diff --git a/airbyte-integrations/connectors/source-smartsheets/unit_tests/test_source.py b/airbyte-integrations/connectors/source-smartsheets/unit_tests/test_source.py
index 09bfcec10c48be..4b71c4d0ceddba 100644
--- a/airbyte-integrations/connectors/source-smartsheets/unit_tests/test_source.py
+++ b/airbyte-integrations/connectors/source-smartsheets/unit_tests/test_source.py
@@ -2,45 +2,23 @@
 # Copyright (c) 2021 Airbyte, Inc., all rights reserved.
 #
 
-import json
-from itertools import permutations
+import logging
 from unittest.mock import Mock
 
 import pytest
 from source_smartsheets.source import SourceSmartsheets
+from source_smartsheets.streams import SmartsheetStream
 
 
-@pytest.fixture
-def config():
-    return {"access_token": "token", "spreadsheet_id": "id"}
-
-
-@pytest.fixture(name="catalog")
-def configured_catalog():
-    stream_mock = Mock()
-    stream_mock.name = "test"  # cannot be used in __init__
-    return Mock(streams=[Mock(stream=stream_mock)])
-
-
-_columns = [
-    {"id": "1101932201830276", "title": "id", "type": "TEXT_NUMBER"},
-    {"id": "5605531829200772", "title": "first_name", "type": "TEXT_NUMBER"},
-    {"id": "3353732015515524", "title": "last_name", "type": "TEXT_NUMBER"},
-]
-
-
-_cells = [
-    {"columnId": "1101932201830276", "value": "11"},
-    {"columnId": "5605531829200772", "value": "Leonardo"},
-    {"columnId": "3353732015515524", "value": "Dicaprio"},
-]
+@pytest.mark.parametrize("connection_status", ((True, None), (False, "Internal Server Error")))
+def test_check_connection(mocker, config, connection_status):
+    mocker.patch("source_smartsheets.source.SmartSheetAPIWrapper.check_connection", Mock(return_value=connection_status))
+    source = SourceSmartsheets()
+    assert source.check_connection(logger=logging.getLogger(), config=config) == connection_status
 
 
-@pytest.mark.parametrize(("row", "columns"), (*((perm, _columns) for perm in permutations(_cells)), ([], _columns), ([], [])))
-def test_different_cell_order_produces_one_result(mocker, config, catalog, row, columns):
-    sheet = json.dumps({"name": "test", "totalRowCount": 3, "columns": columns, "rows": [{"cells": row}] if row else []})
-    mocker.patch("smartsheet.Smartsheet", Mock(return_value=Mock(Sheets=Mock(get_sheet=Mock(return_value=sheet)))))
+def test_streams(config):
     source = SourceSmartsheets()
-    records = [message.record.data for message in source.read(logger=Mock(), config=config, catalog=catalog, state={})]
-    expected_records = [] if not row else [{"id": "11", "first_name": "Leonardo", "last_name": "Dicaprio"}]
-    assert list(records) == expected_records
+    streams_iter = iter(source.streams(config))
+    assert type(next(streams_iter)) == SmartsheetStream
+    assert next(streams_iter, None) is None
diff --git a/airbyte-integrations/connectors/source-smartsheets/unit_tests/test_streams.py b/airbyte-integrations/connectors/source-smartsheets/unit_tests/test_streams.py
new file mode 100644
index 00000000000000..eec95654047d16
--- /dev/null
+++ b/airbyte-integrations/connectors/source-smartsheets/unit_tests/test_streams.py
@@ -0,0 +1,21 @@
+#
+# Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+#
+
+import datetime
+from unittest.mock import Mock
+
+from airbyte_cdk.models import SyncMode
+from source_smartsheets.streams import SmartsheetStream
+
+
+def test_state_saved_after_each_record(config, get_sheet_mocker):
+    today_dt = datetime.datetime.now(datetime.timezone.utc)
+    before_yesterday = (today_dt - datetime.timedelta(days=2)).isoformat(timespec="seconds")
+    today = today_dt.isoformat(timespec="seconds")
+    record = {"id": "1", "name": "Georgio", "last_name": "Armani", "modifiedAt": today}
+    stream = SmartsheetStream(Mock(read_records=Mock(return_value=[record])), config)
+    stream.state = {stream.cursor_field: before_yesterday}
+    for _ in stream.read_records(SyncMode.incremental):
+        assert _ == record
+    assert stream.state == {stream.cursor_field: today}
diff --git a/airbyte-integrations/connectors/source-snowflake/Dockerfile b/airbyte-integrations/connectors/source-snowflake/Dockerfile
index 2756403f596095..f2d1461977b569 100644
--- a/airbyte-integrations/connectors/source-snowflake/Dockerfile
+++ b/airbyte-integrations/connectors/source-snowflake/Dockerfile
@@ -16,5 +16,5 @@ ENV APPLICATION source-snowflake
 
 COPY --from=build /airbyte /airbyte
 
-LABEL io.airbyte.version=0.1.10
+LABEL io.airbyte.version=0.1.11
 LABEL io.airbyte.name=airbyte/source-snowflake
diff --git a/airbyte-integrations/connectors/source-snowflake/README.md b/airbyte-integrations/connectors/source-snowflake/README.md
index 124f7a6c5ccfc6..759a0a6493885f 100644
--- a/airbyte-integrations/connectors/source-snowflake/README.md
+++ b/airbyte-integrations/connectors/source-snowflake/README.md
@@ -13,10 +13,28 @@
   "warehouse": "AIRBYTE_WAREHOUSE",
   "database": "AIRBYTE_DATABASE",
   "schema": "AIRBYTE_SCHEMA",
-  "username": "AIRBYTE_USER",
-  "password": "SOMEPASSWORD"
+  "credentails" {
+    "auth_type": "username/password",
+    "username": "AIRBYTE_USER",
+    "password": "SOMEPASSWORD"
+  }
+}
+```
+3. Create a file at `secrets/config_auth.json` with the following format:
+```
+{
+  "host": "ACCOUNT.REGION.PROVIDER.snowflakecomputing.com",
+  "role": "AIRBYTE_ROLE",
+  "warehouse": "AIRBYTE_WAREHOUSE",
+  "database": "AIRBYTE_DATABASE",
+  "schema": "AIRBYTE_SCHEMA",
+  "credentails" {
+    "auth_type": "OAuth",
+    "client_id": "client_id",
+    "client_secret": "client_secret",
+    "refresh_token": "refresh_token"
+  }
 }
 ```
-
 ## For Airbyte employees
 Put the contents of the `Snowflake Insert Test Creds` secret on Lastpass into `secrets/config.json` to be able to run integration tests locally.
diff --git a/airbyte-integrations/connectors/source-snowflake/build.gradle b/airbyte-integrations/connectors/source-snowflake/build.gradle
index 84f73f77e1722d..c641b62056d62b 100644
--- a/airbyte-integrations/connectors/source-snowflake/build.gradle
+++ b/airbyte-integrations/connectors/source-snowflake/build.gradle
@@ -17,6 +17,7 @@ dependencies {
     implementation project(':airbyte-protocol:models')
     implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
     implementation group: 'net.snowflake', name: 'snowflake-jdbc', version: '3.13.9'
+    implementation 'com.zaxxer:HikariCP:5.0.1'
 
     testImplementation testFixtures(project(':airbyte-integrations:connectors:source-jdbc'))
     testImplementation project(':airbyte-test-utils')
diff --git a/airbyte-integrations/connectors/source-snowflake/src/main/java/io.airbyte.integrations.source.snowflake/SnowflakeDataSourceUtils.java b/airbyte-integrations/connectors/source-snowflake/src/main/java/io.airbyte.integrations.source.snowflake/SnowflakeDataSourceUtils.java
new file mode 100644
index 00000000000000..9d035194311637
--- /dev/null
+++ b/airbyte-integrations/connectors/source-snowflake/src/main/java/io.airbyte.integrations.source.snowflake/SnowflakeDataSourceUtils.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.integrations.source.snowflake;
+
+import static java.util.stream.Collectors.joining;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+import io.airbyte.commons.json.Jsons;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URLEncoder;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpRequest.BodyPublisher;
+import java.net.http.HttpRequest.BodyPublishers;
+import java.net.http.HttpResponse;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SnowflakeDataSourceUtils {
+
+  public static final String OAUTH_METHOD = "OAuth";
+  public static final String USERNAME_PASSWORD_METHOD = "username/password";
+  public static final String UNRECOGNIZED = "Unrecognized";
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(SnowflakeDataSourceUtils.class);
+  private static final int PAUSE_BETWEEN_TOKEN_REFRESH_MIN = 7; // snowflake access token's TTL is 10min and can't be modified
+  private static final String REFRESH_TOKEN_URL = "https://%s/oauth/token-request";
+  private static final HttpClient httpClient = HttpClient.newBuilder()
+      .version(HttpClient.Version.HTTP_2)
+      .connectTimeout(Duration.ofSeconds(10))
+      .build();
+
+  /**
+   * Snowflake OAuth access token expires in 10 minutes. For the cases when sync duration is more than
+   * 10 min, it requires updating 'token' property after the start of connection pool.
+   * HikariDataSource brings support for this requirement.
+   *
+   * @param config source config JSON
+   * @return datasource
+   */
+  public static HikariDataSource createDataSource(final JsonNode config) {
+    HikariDataSource dataSource = new HikariDataSource();
+    dataSource.setJdbcUrl(buildJDBCUrl(config));
+
+    if (config.has("credentials")) {
+      JsonNode credentials = config.get("credentials");
+      final String authType = credentials.has("auth_type") ? credentials.get("auth_type").asText() : UNRECOGNIZED;
+      switch (authType) {
+        case OAUTH_METHOD -> {
+          LOGGER.info("Authorization mode is OAuth");
+          dataSource.setDataSourceProperties(buildAuthProperties(config));
+          // thread to keep the refresh token up to date
+          SnowflakeSource.SCHEDULED_EXECUTOR_SERVICE.scheduleAtFixedRate(
+              getAccessTokenTask(dataSource),
+              PAUSE_BETWEEN_TOKEN_REFRESH_MIN, PAUSE_BETWEEN_TOKEN_REFRESH_MIN, TimeUnit.MINUTES);
+        }
+        case USERNAME_PASSWORD_METHOD -> {
+          LOGGER.info("Authorization mode is 'Username and password'");
+          populateUsernamePasswordConfig(dataSource, config.get("credentials"));
+        }
+        default -> throw new IllegalArgumentException("Unrecognized auth type: " + authType);
+      }
+    } else {
+      LOGGER.info("Authorization mode is deprecated 'Username and password'. Please update your source configuration");
+      populateUsernamePasswordConfig(dataSource, config);
+    }
+
+    return dataSource;
+  }
+
+  /**
+   * Method to make request for a new access token using refresh token and client credentials.
+   *
+   * @return access token
+   */
+  public static String getAccessTokenUsingRefreshToken(final String hostName,
+                                                       final String clientId,
+                                                       final String clientSecret,
+                                                       final String refreshToken)
+      throws IOException {
+    final var refreshTokenUri = String.format(REFRESH_TOKEN_URL, hostName);
+    final Map<String, String> requestBody = new HashMap<>();
+    requestBody.put("grant_type", "refresh_token");
+    requestBody.put("refresh_token", refreshToken);
+
+    try {
+      final BodyPublisher bodyPublisher = BodyPublishers.ofString(requestBody.keySet().stream()
+          .map(key -> key + "=" + URLEncoder.encode(requestBody.get(key), StandardCharsets.UTF_8))
+          .collect(joining("&")));
+
+      final byte[] authorization = Base64.getEncoder()
+          .encode((clientId + ":" + clientSecret).getBytes(StandardCharsets.UTF_8));
+
+      final HttpRequest request = HttpRequest.newBuilder()
+          .POST(bodyPublisher)
+          .uri(URI.create(refreshTokenUri))
+          .header("Content-Type", "application/x-www-form-urlencoded")
+          .header("Accept", "application/json")
+          .header("Authorization", "Basic " + new String(authorization, StandardCharsets.UTF_8))
+          .build();
+
+      final HttpResponse<String> response = httpClient.send(request,
+          HttpResponse.BodyHandlers.ofString());
+
+      final JsonNode jsonResponse = Jsons.deserialize(response.body());
+      if (jsonResponse.has("access_token")) {
+        return jsonResponse.get("access_token").asText();
+      } else {
+        LOGGER.error("Failed to obtain accessToken using refresh token. " + jsonResponse);
+        throw new RuntimeException(
+            "Failed to obtain accessToken using refresh token.");
+      }
+    } catch (final InterruptedException e) {
+      throw new IOException("Failed to refreshToken", e);
+    }
+  }
+
+  public static String buildJDBCUrl(JsonNode config) {
+    final StringBuilder jdbcUrl = new StringBuilder(String.format("jdbc:snowflake://%s/?",
+        config.get("host").asText()));
+
+    // Add required properties
+    jdbcUrl.append(String.format(
+        "role=%s&warehouse=%s&database=%s&schema=%s&JDBC_QUERY_RESULT_FORMAT=%s&CLIENT_SESSION_KEEP_ALIVE=%s",
+        config.get("role").asText(),
+        config.get("warehouse").asText(),
+        config.get("database").asText(),
+        config.get("schema").asText(),
+        // Needed for JDK17 - see
+        // https://stackoverflow.com/questions/67409650/snowflake-jdbc-driver-internal-error-fail-to-retrieve-row-count-for-first-arrow
+        "JSON",
+        true));
+
+    // https://docs.snowflake.com/en/user-guide/jdbc-configure.html#jdbc-driver-connection-string
+    if (config.has("jdbc_url_params")) {
+      jdbcUrl.append("&").append(config.get("jdbc_url_params").asText());
+    }
+    return jdbcUrl.toString();
+  }
+
+  private static Runnable getAccessTokenTask(final HikariDataSource dataSource) {
+    return () -> {
+      LOGGER.info("Refresh token process started");
+      var props = dataSource.getDataSourceProperties();
+      try {
+        var token = getAccessTokenUsingRefreshToken(props.getProperty("host"),
+            props.getProperty("client_id"), props.getProperty("client_secret"),
+            props.getProperty("refresh_token"));
+        props.setProperty("token", token);
+        dataSource.setDataSourceProperties(props);
+        LOGGER.info("New access token has been obtained");
+      } catch (IOException e) {
+        LOGGER.error("Failed to obtain a fresh accessToken:" + e);
+      }
+    };
+  }
+
+  public static Properties buildAuthProperties(JsonNode config) {
+    Properties properties = new Properties();
+    try {
+      var credentials = config.get("credentials");
+      properties.setProperty("client_id", credentials.get("client_id").asText());
+      properties.setProperty("client_secret", credentials.get("client_secret").asText());
+      properties.setProperty("refresh_token", credentials.get("refresh_token").asText());
+      properties.setProperty("host", config.get("host").asText());
+      properties.put("authenticator", "oauth");
+      properties.put("account", config.get("host").asText());
+
+      String accessToken = getAccessTokenUsingRefreshToken(
+          config.get("host").asText(), credentials.get("client_id").asText(),
+          credentials.get("client_secret").asText(), credentials.get("refresh_token").asText());
+
+      properties.put("token", accessToken);
+    } catch (IOException e) {
+      LOGGER.error("Request access token was failed with error" + e.getMessage());
+    }
+    return properties;
+  }
+
+  private static void populateUsernamePasswordConfig(HikariConfig hikariConfig, JsonNode config) {
+    hikariConfig.setUsername(config.get("username").asText());
+    hikariConfig.setPassword(config.get("password").asText());
+  }
+
+}
diff --git a/airbyte-integrations/connectors/source-snowflake/src/main/java/io.airbyte.integrations.source.snowflake/SnowflakeJdbcStreamingQueryConfiguration.java b/airbyte-integrations/connectors/source-snowflake/src/main/java/io.airbyte.integrations.source.snowflake/SnowflakeJdbcStreamingQueryConfiguration.java
deleted file mode 100644
index 6c7750979d758e..00000000000000
--- a/airbyte-integrations/connectors/source-snowflake/src/main/java/io.airbyte.integrations.source.snowflake/SnowflakeJdbcStreamingQueryConfiguration.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
- */
-
-package io.airbyte.integrations.source.snowflake;
-
-import io.airbyte.db.jdbc.JdbcStreamingQueryConfiguration;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-public class SnowflakeJdbcStreamingQueryConfiguration implements
-    JdbcStreamingQueryConfiguration {
-
-  @Override
-  public void accept(final Connection connection, final PreparedStatement preparedStatement)
-      throws SQLException {
-    connection.setAutoCommit(false);
-    preparedStatement.setFetchSize(1000);
-  }
-
-}
diff --git a/airbyte-integrations/connectors/source-snowflake/src/main/java/io.airbyte.integrations.source.snowflake/SnowflakeSource.java b/airbyte-integrations/connectors/source-snowflake/src/main/java/io.airbyte.integrations.source.snowflake/SnowflakeSource.java
index b404e4fc3b3b3c..a22abe03a10b91 100644
--- a/airbyte-integrations/connectors/source-snowflake/src/main/java/io.airbyte.integrations.source.snowflake/SnowflakeSource.java
+++ b/airbyte-integrations/connectors/source-snowflake/src/main/java/io.airbyte.integrations.source.snowflake/SnowflakeSource.java
@@ -4,14 +4,26 @@
 
 package io.airbyte.integrations.source.snowflake;
 
+import static io.airbyte.integrations.source.snowflake.SnowflakeDataSourceUtils.OAUTH_METHOD;
+import static io.airbyte.integrations.source.snowflake.SnowflakeDataSourceUtils.UNRECOGNIZED;
+import static io.airbyte.integrations.source.snowflake.SnowflakeDataSourceUtils.USERNAME_PASSWORD_METHOD;
+
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.collect.ImmutableMap;
 import io.airbyte.commons.json.Jsons;
+import io.airbyte.db.jdbc.JdbcDatabase;
+import io.airbyte.db.jdbc.StreamingJdbcDatabase;
+import io.airbyte.db.jdbc.streaming.AdaptiveStreamingQueryConfig;
 import io.airbyte.integrations.base.IntegrationRunner;
 import io.airbyte.integrations.base.Source;
 import io.airbyte.integrations.source.jdbc.AbstractJdbcSource;
+import java.io.IOException;
 import java.sql.JDBCType;
+import java.sql.SQLException;
 import java.util.Set;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import javax.sql.DataSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -19,54 +31,77 @@ public class SnowflakeSource extends AbstractJdbcSource<JDBCType> implements Sou
 
   private static final Logger LOGGER = LoggerFactory.getLogger(SnowflakeSource.class);
   public static final String DRIVER_CLASS = "net.snowflake.client.jdbc.SnowflakeDriver";
+  public static final ScheduledExecutorService SCHEDULED_EXECUTOR_SERVICE = Executors.newScheduledThreadPool(1);
 
   public SnowflakeSource() {
-    super(DRIVER_CLASS, new SnowflakeJdbcStreamingQueryConfiguration(), new SnowflakeSourceOperations());
+    super(DRIVER_CLASS, AdaptiveStreamingQueryConfig::new, new SnowflakeSourceOperations());
   }
 
   public static void main(final String[] args) throws Exception {
     final Source source = new SnowflakeSource();
     LOGGER.info("starting source: {}", SnowflakeSource.class);
     new IntegrationRunner(source).run(args);
+    SCHEDULED_EXECUTOR_SERVICE.shutdownNow();
     LOGGER.info("completed source: {}", SnowflakeSource.class);
   }
 
+  @Override
+  public JdbcDatabase createDatabase(final JsonNode config) throws SQLException {
+    final DataSource dataSource = SnowflakeDataSourceUtils.createDataSource(config);
+    final var database = new StreamingJdbcDatabase(dataSource, new SnowflakeSourceOperations(), AdaptiveStreamingQueryConfig::new);
+    quoteString = database.getMetaData().getIdentifierQuoteString();
+    return database;
+  }
+
   @Override
   public JsonNode toDatabaseConfig(final JsonNode config) {
+    final String jdbcUrl = SnowflakeDataSourceUtils.buildJDBCUrl(config);
 
-    final StringBuilder jdbcUrl = new StringBuilder(String.format("jdbc:snowflake://%s/?",
-        config.get("host").asText()));
+    if (config.has("credentials")) {
+      final JsonNode credentials = config.get("credentials");
+      final String authType =
+          credentials.has("auth_type") ? credentials.get("auth_type").asText() : UNRECOGNIZED;
+      return switch (authType) {
+        case OAUTH_METHOD -> buildOAuthConfig(config, jdbcUrl);
+        case USERNAME_PASSWORD_METHOD -> buildUsernamePasswordConfig(config.get("credentials"),
+            jdbcUrl);
+        default -> throw new IllegalArgumentException("Unrecognized auth type: " + authType);
+      };
+    } else {
+      return buildUsernamePasswordConfig(config, jdbcUrl);
+    }
+  }
 
-    // Add required properties
-    jdbcUrl.append(String.format("role=%s&warehouse=%s&database=%s&schema=%s&JDBC_QUERY_RESULT_FORMAT=%s&CLIENT_SESSION_KEEP_ALIVE=%s",
-        config.get("role").asText(),
-        config.get("warehouse").asText(),
-        config.get("database").asText(),
-        config.get("schema").asText(),
-        // Needed for JDK17 - see
-        // https://stackoverflow.com/questions/67409650/snowflake-jdbc-driver-internal-error-fail-to-retrieve-row-count-for-first-arrow
-        "JSON",
-        true));
+  @Override
+  public Set<String> getExcludedInternalNameSpaces() {
+    return Set.of(
+        "INFORMATION_SCHEMA");
+  }
 
-    // https://docs.snowflake.com/en/user-guide/jdbc-configure.html#jdbc-driver-connection-string
-    if (config.has("jdbc_url_params")) {
-      jdbcUrl.append("&").append(config.get("jdbc_url_params").asText());
+  private JsonNode buildOAuthConfig(final JsonNode config, final String jdbcUrl) {
+    final String accessToken;
+    final var credentials = config.get("credentials");
+    try {
+      accessToken = SnowflakeDataSourceUtils.getAccessTokenUsingRefreshToken(
+          config.get("host").asText(), credentials.get("client_id").asText(),
+          credentials.get("client_secret").asText(), credentials.get("refresh_token").asText());
+    } catch (final IOException e) {
+      throw new RuntimeException(e);
     }
+    final ImmutableMap.Builder<Object, Object> configBuilder = ImmutableMap.builder()
+        .put("connection_properties",
+            String.join(";", "authenticator=oauth", "token=" + accessToken))
+        .put("jdbc_url", jdbcUrl);
+    return Jsons.jsonNode(configBuilder.build());
+  }
 
-    LOGGER.info(jdbcUrl.toString());
-
+  private JsonNode buildUsernamePasswordConfig(final JsonNode config, final String jdbcUrl) {
     final ImmutableMap.Builder<Object, Object> configBuilder = ImmutableMap.builder()
         .put("username", config.get("username").asText())
         .put("password", config.get("password").asText())
-        .put("jdbc_url", jdbcUrl.toString());
-
+        .put("jdbc_url", jdbcUrl);
+    LOGGER.info(jdbcUrl);
     return Jsons.jsonNode(configBuilder.build());
   }
 
-  @Override
-  public Set<String> getExcludedInternalNameSpaces() {
-    return Set.of(
-        "INFORMATION_SCHEMA");
-  }
-
 }
diff --git a/airbyte-integrations/connectors/source-snowflake/src/main/resources/spec.json b/airbyte-integrations/connectors/source-snowflake/src/main/resources/spec.json
index 95b989811537cb..689926366c68eb 100644
--- a/airbyte-integrations/connectors/source-snowflake/src/main/resources/spec.json
+++ b/airbyte-integrations/connectors/source-snowflake/src/main/resources/spec.json
@@ -4,71 +4,183 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "title": "Snowflake Source Spec",
     "type": "object",
-    "required": [
-      "host",
-      "role",
-      "warehouse",
-      "database",
-      "schema",
-      "username",
-      "password"
-    ],
-    "additionalProperties": false,
+    "required": ["host", "role", "warehouse", "database", "schema"],
+    "additionalProperties": true,
     "properties": {
+      "credentials": {
+        "title": "Authorization Method",
+        "type": "object",
+        "oneOf": [
+          {
+            "type": "object",
+            "title": "OAuth2.0",
+            "order": 0,
+            "required": ["client_id", "client_secret", "auth_type"],
+            "properties": {
+              "auth_type": {
+                "type": "string",
+                "const": "OAuth",
+                "default": "OAuth",
+                "order": 0
+              },
+              "client_id": {
+                "type": "string",
+                "title": "Client ID",
+                "description": "The Client ID of your Snowflake developer application.",
+                "airbyte_secret": true,
+                "order": 1
+              },
+              "client_secret": {
+                "type": "string",
+                "title": "Client Secret",
+                "description": "The Client Secret of your Snowflake developer application.",
+                "airbyte_secret": true,
+                "order": 2
+              },
+              "access_token": {
+                "type": "string",
+                "title": "Access Token",
+                "description": "Access Token for making authenticated requests.",
+                "airbyte_secret": true,
+                "order": 3
+              },
+              "refresh_token": {
+                "type": "string",
+                "title": "Refresh Token",
+                "description": "Refresh Token for making authenticated requests.",
+                "airbyte_secret": true,
+                "order": 4
+              }
+            }
+          },
+          {
+            "title": "Username and Password",
+            "type": "object",
+            "required": ["username", "password", "auth_type"],
+            "order": 1,
+            "properties": {
+              "auth_type": {
+                "type": "string",
+                "const": "username/password",
+                "default": "username/password",
+                "order": 0
+              },
+              "username": {
+                "description": "The username you created to allow Airbyte to access the database.",
+                "examples": ["AIRBYTE_USER"],
+                "type": "string",
+                "title": "Username",
+                "order": 1
+              },
+              "password": {
+                "description": "The password associated with the username.",
+                "type": "string",
+                "airbyte_secret": true,
+                "title": "Password",
+                "order": 2
+              }
+            }
+          }
+        ],
+        "order": 0
+      },
       "host": {
         "description": "The host domain of the snowflake instance (must include the account, region, cloud environment, and end with snowflakecomputing.com).",
         "examples": ["accountname.us-east-2.aws.snowflakecomputing.com"],
         "type": "string",
         "title": "Account Name",
-        "order": 0
+        "order": 1
       },
       "role": {
         "description": "The role you created for Airbyte to access Snowflake.",
         "examples": ["AIRBYTE_ROLE"],
         "type": "string",
         "title": "Role",
-        "order": 1
+        "order": 2
       },
       "warehouse": {
         "description": "The warehouse you created for Airbyte to access data.",
         "examples": ["AIRBYTE_WAREHOUSE"],
         "type": "string",
         "title": "Warehouse",
-        "order": 2
+        "order": 3
       },
       "database": {
         "description": "The database you created for Airbyte to access data.",
         "examples": ["AIRBYTE_DATABASE"],
         "type": "string",
         "title": "Database",
-        "order": 3
+        "order": 4
       },
       "schema": {
         "description": "The source Snowflake schema tables.",
         "examples": ["AIRBYTE_SCHEMA"],
         "type": "string",
         "title": "Schema",
-        "order": 4
-      },
-      "username": {
-        "description": "The username you created to allow Airbyte to access the database.",
-        "examples": ["AIRBYTE_USER"],
-        "type": "string",
-        "title": "Username",
         "order": 5
       },
-      "password": {
-        "description": "The password associated with the username.",
-        "type": "string",
-        "airbyte_secret": true,
-        "title": "Password",
-        "order": 6
-      },
       "jdbc_url_params": {
         "description": "Additional properties to pass to the JDBC URL string when connecting to the database formatted as 'key=value' pairs separated by the symbol '&'. (example: key1=value1&key2=value2&key3=value3).",
         "title": "JDBC URL Params",
         "type": "string",
-        "order": 7
+        "order": 6
+      }
+    }
+  },
+  "advanced_auth": {
+    "auth_flow_type": "oauth2.0",
+    "predicate_key": ["credentials", "auth_type"],
+    "predicate_value": "OAuth",
+    "oauth_config_specification": {
+      "oauth_user_input_from_connector_config_specification": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "host": {
+            "type": "string",
+            "path_in_connector_config": ["host"]
+          }
+        }
+      },
+      "complete_oauth_output_specification": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "access_token": {
+            "type": "string",
+            "path_in_connector_config": ["credentials", "access_token"]
+          },
+          "refresh_token": {
+            "type": "string",
+            "path_in_connector_config": ["credentials", "refresh_token"]
+          }
+        }
+      },
+      "complete_oauth_server_input_specification": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "client_id": {
+            "type": "string"
+          },
+          "client_secret": {
+            "type": "string"
+          }
+        }
+      },
+      "complete_oauth_server_output_specification": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "client_id": {
+            "type": "string",
+            "path_in_connector_config": ["credentials", "client_id"]
+          },
+          "client_secret": {
+            "type": "string",
+            "path_in_connector_config": ["credentials", "client_secret"]
+          }
+        }
       }
     }
   }
diff --git a/airbyte-integrations/connectors/source-snowflake/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SnowflakeJdbcSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-snowflake/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SnowflakeJdbcSourceAcceptanceTest.java
index 011c4aad414b3a..9c81721ebc702e 100644
--- a/airbyte-integrations/connectors/source-snowflake/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SnowflakeJdbcSourceAcceptanceTest.java
+++ b/airbyte-integrations/connectors/source-snowflake/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SnowflakeJdbcSourceAcceptanceTest.java
@@ -4,19 +4,25 @@
 
 package io.airbyte.integrations.io.airbyte.integration_tests.sources;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.ImmutableSet;
 import io.airbyte.commons.io.IOs;
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.integrations.source.jdbc.AbstractJdbcSource;
 import io.airbyte.integrations.source.jdbc.test.JdbcSourceAcceptanceTest;
 import io.airbyte.integrations.source.snowflake.SnowflakeSource;
+import io.airbyte.protocol.models.AirbyteConnectionStatus;
+import io.airbyte.protocol.models.AirbyteConnectionStatus.Status;
 import java.math.BigDecimal;
 import java.nio.file.Path;
 import java.sql.JDBCType;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 class SnowflakeJdbcSourceAcceptanceTest extends JdbcSourceAcceptanceTest {
 
@@ -26,10 +32,6 @@ class SnowflakeJdbcSourceAcceptanceTest extends JdbcSourceAcceptanceTest {
   static void init() {
     snConfig = Jsons
         .deserialize(IOs.readFile(Path.of("secrets/config.json")));
-  }
-
-  @BeforeEach
-  public void setup() throws Exception {
     // due to case sensitiveness in SnowflakeDB
     SCHEMA_NAME = "JDBC_INTEGRATION_TEST1";
     SCHEMA_NAME2 = "JDBC_INTEGRATION_TEST2";
@@ -49,7 +51,10 @@ public void setup() throws Exception {
     ID_VALUE_3 = new BigDecimal(3);
     ID_VALUE_4 = new BigDecimal(4);
     ID_VALUE_5 = new BigDecimal(5);
+  }
 
+  @BeforeEach
+  public void setup() throws Exception {
     super.setup();
   }
 
@@ -79,4 +84,11 @@ public AbstractJdbcSource<JDBCType> getJdbcSource() {
     return new SnowflakeSource();
   }
 
+  @Test
+  void testCheckFailure() throws Exception {
+    ((ObjectNode) config.get("credentials")).put("password", "fake");
+    final AirbyteConnectionStatus actual = source.check(config);
+    assertEquals(Status.FAILED, actual.getStatus());
+  }
+
 }
diff --git a/airbyte-integrations/connectors/source-snowflake/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SnowflakeSourceAcceptanceTest.java b/airbyte-integrations/connectors/source-snowflake/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SnowflakeSourceAcceptanceTest.java
index 9f7047ea306cb6..9b676083f03e90 100644
--- a/airbyte-integrations/connectors/source-snowflake/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SnowflakeSourceAcceptanceTest.java
+++ b/airbyte-integrations/connectors/source-snowflake/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SnowflakeSourceAcceptanceTest.java
@@ -4,7 +4,10 @@
 
 package io.airbyte.integrations.io.airbyte.integration_tests.sources;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.Lists;
 import io.airbyte.commons.io.IOs;
 import io.airbyte.commons.json.Jsons;
@@ -26,6 +29,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.jupiter.api.Test;
 
 public class SnowflakeSourceAcceptanceTest extends SourceAcceptanceTest {
 
@@ -35,8 +39,8 @@ public class SnowflakeSourceAcceptanceTest extends SourceAcceptanceTest {
   private static final String STREAM_NAME2 = "ID_AND_NAME2";
 
   // config which refers to the schema that the test is being run in.
-  private JsonNode config;
-  private JdbcDatabase database;
+  protected JsonNode config;
+  protected JdbcDatabase database;
 
   @Override
   protected String getImageName() {
@@ -90,17 +94,7 @@ protected JsonNode getState() {
   // for each test we create a new schema in the database. run the test in there and then remove it.
   @Override
   protected void setupEnvironment(final TestDestinationEnv environment) throws Exception {
-    config = Jsons.clone(getStaticConfig());
-    database = Databases.createJdbcDatabase(
-        config.get("username").asText(),
-        config.get("password").asText(),
-        String.format("jdbc:snowflake://%s/",
-            config.get("host").asText()),
-        SnowflakeSource.DRIVER_CLASS,
-        Map.of("role", config.get("role").asText(),
-            "warehouse", config.get("warehouse").asText(),
-            "database", config.get("database").asText()));
-
+    database = setupDataBase();
     final String createSchemaQuery = String.format("CREATE SCHEMA IF NOT EXISTS %s", SCHEMA_NAME);
     final String createTableQuery1 = String
         .format("CREATE OR REPLACE TABLE %s.%s (ID INTEGER, NAME VARCHAR(200))", SCHEMA_NAME,
@@ -130,4 +124,30 @@ protected void tearDown(final TestDestinationEnv testEnv) throws Exception {
     database.close();
   }
 
+  protected JdbcDatabase setupDataBase() {
+    config = Jsons.clone(getStaticConfig());
+    return Databases.createJdbcDatabase(
+        config.get("credentials").get("username").asText(),
+        config.get("credentials").get("password").asText(),
+        String.format("jdbc:snowflake://%s/",
+            config.get("host").asText()),
+        SnowflakeSource.DRIVER_CLASS,
+        Map.of("role", config.get("role").asText(),
+            "warehouse", config.get("warehouse").asText(),
+            "database", config.get("database").asText()));
+  }
+
+  @Test
+  public void testBackwardCompatibilityAfterAddingOAuth() throws Exception {
+    final JsonNode deprecatedStyleConfig = Jsons.clone(config);
+    final JsonNode password = deprecatedStyleConfig.get("credentials").get("password");
+    final JsonNode username = deprecatedStyleConfig.get("credentials").get("username");
+
+    ((ObjectNode) deprecatedStyleConfig).remove("credentials");
+    ((ObjectNode) deprecatedStyleConfig).set("password", password);
+    ((ObjectNode) deprecatedStyleConfig).set("username", username);
+
+    assertEquals("SUCCEEDED", runCheckAndGetStatusAsString(deprecatedStyleConfig).toUpperCase());
+  }
+
 }
diff --git a/airbyte-integrations/connectors/source-snowflake/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SnowflakeSourceAuthAcceptanceTest.java b/airbyte-integrations/connectors/source-snowflake/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SnowflakeSourceAuthAcceptanceTest.java
new file mode 100644
index 00000000000000..19265cf3529f5a
--- /dev/null
+++ b/airbyte-integrations/connectors/source-snowflake/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SnowflakeSourceAuthAcceptanceTest.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.integrations.io.airbyte.integration_tests.sources;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.zaxxer.hikari.HikariDataSource;
+import io.airbyte.commons.io.IOs;
+import io.airbyte.commons.json.Jsons;
+import io.airbyte.db.jdbc.JdbcDatabase;
+import io.airbyte.db.jdbc.JdbcUtils;
+import io.airbyte.db.jdbc.StreamingJdbcDatabase;
+import io.airbyte.db.jdbc.streaming.AdaptiveStreamingQueryConfig;
+import io.airbyte.integrations.source.snowflake.SnowflakeDataSourceUtils;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Properties;
+import javax.sql.DataSource;
+
+public class SnowflakeSourceAuthAcceptanceTest extends SnowflakeSourceAcceptanceTest {
+
+  @Override
+  protected JdbcDatabase setupDataBase() {
+    config = getStaticConfig();
+    final DataSource dataSource = createDataSource(getStaticConfig());
+    return new StreamingJdbcDatabase(dataSource,
+        JdbcUtils.getDefaultSourceOperations(),
+        AdaptiveStreamingQueryConfig::new);
+  }
+
+  private HikariDataSource createDataSource(final JsonNode config) {
+    final HikariDataSource dataSource = new HikariDataSource();
+    final Properties properties = new Properties();
+
+    final StringBuilder jdbcUrl = new StringBuilder(
+        String.format("jdbc:snowflake://%s/?", config.get("host").asText()));
+    jdbcUrl.append(String.format(
+        "role=%s&warehouse=%s&database=%s&schema=%s&JDBC_QUERY_RESULT_FORMAT=%s&CLIENT_SESSION_KEEP_ALIVE=%s",
+        config.get("role").asText(),
+        config.get("warehouse").asText(),
+        config.get("database").asText(),
+        config.get("schema").asText(),
+        // Needed for JDK17 - see
+        // https://stackoverflow.com/questions/67409650/snowflake-jdbc-driver-internal-error-fail-to-retrieve-row-count-for-first-arrow
+        "JSON",
+        true));
+    if (config.has("jdbc_url_params")) {
+      jdbcUrl.append(config.get("jdbc_url_params").asText());
+    }
+
+    final var credentials = config.get("credentials");
+    try {
+      properties.setProperty("client_id", credentials.get("client_id").asText());
+      properties.setProperty("client_secret", credentials.get("client_secret").asText());
+      properties.setProperty("refresh_token", credentials.get("refresh_token").asText());
+      properties.setProperty("host", config.get("host").asText());
+      final var accessToken = SnowflakeDataSourceUtils.getAccessTokenUsingRefreshToken(
+          config.get("host").asText(), credentials.get("client_id").asText(),
+          credentials.get("client_secret").asText(), credentials.get("refresh_token").asText());
+      properties.put("authenticator", "oauth");
+      properties.put("token", accessToken);
+    } catch (final IOException e) {
+      throw new RuntimeException(e);
+    }
+
+    properties.put("warehouse", config.get("warehouse").asText());
+    properties.put("account", config.get("host").asText());
+    properties.put("role", config.get("role").asText());
+    // allows queries to contain any number of statements
+    properties.put("MULTI_STATEMENT_COUNT", "0");
+    // https://docs.snowflake.com/en/user-guide/jdbc-parameters.html#application
+    // identify airbyte traffic to snowflake to enable partnership & optimization opportunities
+    properties.put("dataSource.application", "airbyte");
+    // Needed for JDK17 - see
+    // https://stackoverflow.com/questions/67409650/snowflake-jdbc-driver-internal-error-fail-to-retrieve-row-count-for-first-arrow
+    properties.put("JDBC_QUERY_RESULT_FORMAT", "JSON");
+
+    dataSource.setDriverClassName("net.snowflake.client.jdbc.SnowflakeDriver");
+    dataSource.setJdbcUrl(jdbcUrl.toString());
+    dataSource.setDataSourceProperties(properties);
+    return dataSource;
+  }
+
+  JsonNode getStaticConfig() {
+    return Jsons
+        .deserialize(IOs.readFile(Path.of("secrets/config_auth.json")));
+  }
+
+  @Override
+  public void testBackwardCompatibilityAfterAddingOAuth() throws Exception {
+    // this test case is not valid for OAuth method
+  }
+
+}
diff --git a/airbyte-integrations/connectors/source-snowflake/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SnowflakeSourceDatatypeTest.java b/airbyte-integrations/connectors/source-snowflake/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SnowflakeSourceDatatypeTest.java
index bf739e15246b0d..df49c9884d3fa2 100644
--- a/airbyte-integrations/connectors/source-snowflake/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SnowflakeSourceDatatypeTest.java
+++ b/airbyte-integrations/connectors/source-snowflake/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SnowflakeSourceDatatypeTest.java
@@ -51,8 +51,8 @@ protected Database setupDatabase() throws Exception {
 
   private Database getDatabase() {
     return Databases.createDatabase(
-        config.get("username").asText(),
-        config.get("password").asText(),
+        config.get("credentials").get("username").asText(),
+        config.get("credentials").get("password").asText(),
         String.format("jdbc:snowflake://%s/",
             config.get("host").asText()),
         SnowflakeSource.DRIVER_CLASS,
diff --git a/airbyte-integrations/connectors/source-snowflake/src/test/java/io/airbyte/integrations/source/snowflake/SnowflakeDataSourceUtilsTest.java b/airbyte-integrations/connectors/source-snowflake/src/test/java/io/airbyte/integrations/source/snowflake/SnowflakeDataSourceUtilsTest.java
new file mode 100644
index 00000000000000..bf7080d82b0a66
--- /dev/null
+++ b/airbyte-integrations/connectors/source-snowflake/src/test/java/io/airbyte/integrations/source/snowflake/SnowflakeDataSourceUtilsTest.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.integrations.source.snowflake;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import io.airbyte.commons.json.Jsons;
+import org.junit.jupiter.api.Test;
+
+class SnowflakeDataSourceUtilsTest {
+
+  private final String config = """
+                                {
+                                  "host": "host",
+                                  "role": "role",
+                                  "schema": "SOURCE_SCHEMA",
+                                  "database": "DATABASE",
+                                  "warehouse": "WAREHOUSE",
+                                  "credentials": {
+                                    "auth_type": "OAuth",
+                                    "client_id": "someid",
+                                    "access_token": "**********",
+                                    "client_secret": "clientSecret",
+                                    "refresh_token": "token"
+                                  }
+                                }
+                                """;
+  private final String expectedJdbcUrl =
+      "jdbc:snowflake://host/?role=role&warehouse=WAREHOUSE&database=DATABASE&schema=SOURCE_SCHEMA&JDBC_QUERY_RESULT_FORMAT=JSON&CLIENT_SESSION_KEEP_ALIVE=true";
+
+  @Test
+  void testBuildJDBCUrl() {
+    JsonNode expectedConfig = Jsons.deserialize(config);
+
+    String jdbcURL = SnowflakeDataSourceUtils.buildJDBCUrl(expectedConfig);
+
+    assertEquals(expectedJdbcUrl, jdbcURL);
+  }
+
+  @Test
+  void testBuildJDBCUrlWithParams() {
+    JsonNode expectedConfig = Jsons.deserialize(config);
+    String params = "someParameter1&param2=someParameter2";
+    ((ObjectNode) expectedConfig).put("jdbc_url_params", params);
+
+    String jdbcURL = SnowflakeDataSourceUtils.buildJDBCUrl(expectedConfig);
+
+    assertEquals(expectedJdbcUrl + "&" + params, jdbcURL);
+  }
+
+}
diff --git a/airbyte-integrations/connectors/source-tidb/src/main/java/io/airbyte/integrations/source/tidb/TiDBSource.java b/airbyte-integrations/connectors/source-tidb/src/main/java/io/airbyte/integrations/source/tidb/TiDBSource.java
index fea9e0c41bf1a7..370236b8d69172 100644
--- a/airbyte-integrations/connectors/source-tidb/src/main/java/io/airbyte/integrations/source/tidb/TiDBSource.java
+++ b/airbyte-integrations/connectors/source-tidb/src/main/java/io/airbyte/integrations/source/tidb/TiDBSource.java
@@ -8,7 +8,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.mysql.cj.MysqlType;
 import io.airbyte.commons.json.Jsons;
-import io.airbyte.db.jdbc.NoOpJdbcStreamingQueryConfiguration;
+import io.airbyte.db.jdbc.streaming.NoOpStreamingQueryConfig;
 import io.airbyte.integrations.base.IntegrationRunner;
 import io.airbyte.integrations.base.Source;
 import io.airbyte.integrations.base.ssh.SshWrappedSource;
@@ -33,7 +33,7 @@ public static Source sshWrappedSource() {
   }
 
   public TiDBSource() {
-    super(DRIVER_CLASS, new NoOpJdbcStreamingQueryConfiguration(), new TiDBSourceOperations());
+    super(DRIVER_CLASS, NoOpStreamingQueryConfig::new, new TiDBSourceOperations());
   }
 
   @Override
diff --git a/airbyte-integrations/connectors/source-tiktok-marketing/Dockerfile b/airbyte-integrations/connectors/source-tiktok-marketing/Dockerfile
index 690dfa479c1417..5524acd9717b7c 100644
--- a/airbyte-integrations/connectors/source-tiktok-marketing/Dockerfile
+++ b/airbyte-integrations/connectors/source-tiktok-marketing/Dockerfile
@@ -32,5 +32,5 @@ COPY source_tiktok_marketing ./source_tiktok_marketing
 ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=0.1.6
+LABEL io.airbyte.version=0.1.7
 LABEL io.airbyte.name=airbyte/source-tiktok-marketing
diff --git a/airbyte-integrations/connectors/source-tiktok-marketing/integration_tests/spec.json b/airbyte-integrations/connectors/source-tiktok-marketing/integration_tests/spec.json
index bd914e8e5d62a8..da6cad26a536c7 100644
--- a/airbyte-integrations/connectors/source-tiktok-marketing/integration_tests/spec.json
+++ b/airbyte-integrations/connectors/source-tiktok-marketing/integration_tests/spec.json
@@ -5,26 +5,10 @@
     "title": "TikTok Marketing Source Spec",
     "type": "object",
     "properties": {
-      "start_date": {
-        "title": "Start Date",
-        "description": "The Start Date in format: YYYY-MM-DD. Any data before this date will not be replicated. If this parameter is not set, all data will be replicated.",
-        "default": "2016-09-01",
-        "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}$",
-        "order": 0,
-        "type": "string"
-      },
-      "report_granularity": {
-        "title": "Report Granularity",
-        "description": "Which time granularity should be grouped by; for LIFETIME there will be no grouping. This option is used for reports' streams only.",
-        "default": "DAY",
-        "enum": ["LIFETIME", "DAY", "HOUR"],
-        "order": 1,
-        "type": "string"
-      },
       "credentials": {
-        "title": "Authorization Method",
+        "title": "Authentication *",
         "default": {},
-        "order": 3,
+        "order": 0,
         "type": "object",
         "oneOf": [
           {
@@ -113,6 +97,22 @@
             "required": ["advertiser_id", "access_token"]
           }
         ]
+      },
+      "start_date": {
+        "title": "Start Date *",
+        "description": "The Start Date in format: YYYY-MM-DD. Any data before this date will not be replicated. If this parameter is not set, all data will be replicated.",
+        "default": "2016-09-01",
+        "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}$",
+        "order": 1,
+        "type": "string"
+      },
+      "report_granularity": {
+        "title": "Report Granularity *",
+        "description": "Which time granularity should be grouped by; for LIFETIME there will be no grouping. This option is used for reports' streams only.",
+        "default": "DAY",
+        "enum": ["LIFETIME", "DAY", "HOUR"],
+        "order": 2,
+        "type": "string"
       }
     }
   },
diff --git a/airbyte-integrations/connectors/source-tiktok-marketing/source_tiktok_marketing/spec.py b/airbyte-integrations/connectors/source-tiktok-marketing/source_tiktok_marketing/spec.py
index 79019570f0ce54..f33e829befff06 100644
--- a/airbyte-integrations/connectors/source-tiktok-marketing/source_tiktok_marketing/spec.py
+++ b/airbyte-integrations/connectors/source-tiktok-marketing/source_tiktok_marketing/spec.py
@@ -57,26 +57,26 @@ class SourceTiktokMarketingSpec(BaseModel):
     class Config:
         title = "TikTok Marketing Source Spec"
 
+    credentials: Union[OauthCredSpec, ProductionEnvSpec, SandboxEnvSpec] = Field(
+        title="Authentication *", order=0, default={}, type="object"
+    )
+
     start_date: str = Field(
-        title="Start Date",
+        title="Start Date *",
         default=DEFAULT_START_DATE,
         pattern="^[0-9]{4}-[0-9]{2}-[0-9]{2}$",
         description="The Start Date in format: YYYY-MM-DD. Any data before this date will not be replicated. "
         "If this parameter is not set, all data will be replicated.",
-        order=0,
+        order=1,
     )
 
     report_granularity: str = Field(
-        title="Report Granularity",
+        title="Report Granularity *",
         description="Which time granularity should be grouped by; for LIFETIME there will be no grouping. "
         "This option is used for reports' streams only.",
         default=ReportGranularity.default().value,
         enum=[g.value for g in ReportGranularity],
-        order=1,
-    )
-
-    credentials: Union[OauthCredSpec, ProductionEnvSpec, SandboxEnvSpec] = Field(
-        title="Authorization Method", order=3, default={}, type="object"
+        order=2,
     )
 
     @classmethod
diff --git a/airbyte-integrations/connectors/source-zendesk-support/Dockerfile b/airbyte-integrations/connectors/source-zendesk-support/Dockerfile
index 72bc2ab36ba5ec..6519e236e3820a 100644
--- a/airbyte-integrations/connectors/source-zendesk-support/Dockerfile
+++ b/airbyte-integrations/connectors/source-zendesk-support/Dockerfile
@@ -25,5 +25,5 @@ COPY source_zendesk_support ./source_zendesk_support
 ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=0.2.6
+LABEL io.airbyte.version=0.2.7
 LABEL io.airbyte.name=airbyte/source-zendesk-support
diff --git a/airbyte-integrations/connectors/source-zendesk-support/setup.py b/airbyte-integrations/connectors/source-zendesk-support/setup.py
index b15858f0bf879b..86ab517a9fad4b 100644
--- a/airbyte-integrations/connectors/source-zendesk-support/setup.py
+++ b/airbyte-integrations/connectors/source-zendesk-support/setup.py
@@ -7,7 +7,7 @@
 
 MAIN_REQUIREMENTS = ["airbyte-cdk~=0.1.36", "pytz", "requests-futures~=1.0.0", "pendulum~=2.1.2"]
 
-TEST_REQUIREMENTS = ["pytest~=6.1", "source-acceptance-test", "requests-mock==1.9.3"]
+TEST_REQUIREMENTS = ["pytest~=6.1", "pytest-mock~=3.6", "source-acceptance-test", "requests-mock==1.9.3"]
 
 setup(
     version="0.1.0",
diff --git a/airbyte-integrations/connectors/source-zendesk-support/unit_tests/test_futures.py b/airbyte-integrations/connectors/source-zendesk-support/unit_tests/test_futures.py
index fb86fe2cf2b3e0..5afeb5dd9d724d 100644
--- a/airbyte-integrations/connectors/source-zendesk-support/unit_tests/test_futures.py
+++ b/airbyte-integrations/connectors/source-zendesk-support/unit_tests/test_futures.py
@@ -21,6 +21,12 @@
 }
 
 
+@pytest.fixture(autouse=True)
+def time_sleep_mock(mocker):
+    time_mock = mocker.patch("time.sleep", lambda x: None)
+    yield time_mock
+
+
 @pytest.mark.parametrize(
     "records_count,page_size,expected_futures_deque_len",
     [
diff --git a/airbyte-integrations/connectors/source-zendesk-support/unit_tests/unit_test.py b/airbyte-integrations/connectors/source-zendesk-support/unit_tests/unit_test.py
index 20847fb78f309e..c5a70147032075 100644
--- a/airbyte-integrations/connectors/source-zendesk-support/unit_tests/unit_test.py
+++ b/airbyte-integrations/connectors/source-zendesk-support/unit_tests/unit_test.py
@@ -69,6 +69,12 @@
 TEST_STREAM = TicketComments(**STREAM_ARGS)
 
 
+@pytest.fixture(autouse=True)
+def time_sleep_mock(mocker):
+    time_mock = mocker.patch("time.sleep", lambda x: None)
+    yield time_mock
+
+
 def test_str2datetime():
     expected = datetime.strptime(DATETIME_STR, DATETIME_FORMAT)
     output = BaseSourceZendeskSupportStream.str2datetime(DATETIME_STR)
diff --git a/airbyte-metrics/reporter/Dockerfile b/airbyte-metrics/reporter/Dockerfile
index 024bbb22fd344c..2282a6923040b2 100644
--- a/airbyte-metrics/reporter/Dockerfile
+++ b/airbyte-metrics/reporter/Dockerfile
@@ -1,7 +1,7 @@
 ARG JDK_VERSION=17.0.1
 FROM openjdk:${JDK_VERSION}-slim AS metrics-reporter
 
-ARG VERSION=0.36.3-alpha
+ARG VERSION=0.36.5-alpha
 
 ENV APPLICATION airbyte-metrics-reporter
 ENV VERSION ${VERSION}
diff --git a/airbyte-oauth/src/main/java/io/airbyte/oauth/OAuthImplementationFactory.java b/airbyte-oauth/src/main/java/io/airbyte/oauth/OAuthImplementationFactory.java
index 9fb4056af3f5a8..06723d5b0ef31d 100644
--- a/airbyte-oauth/src/main/java/io/airbyte/oauth/OAuthImplementationFactory.java
+++ b/airbyte-oauth/src/main/java/io/airbyte/oauth/OAuthImplementationFactory.java
@@ -63,6 +63,7 @@ public OAuthImplementationFactory(final ConfigRepository configRepository, final
         .put("airbyte/source-shopify", new ShopifyOAuthFlow(configRepository, httpClient))
         .put("airbyte/source-tiktok-marketing", new TikTokMarketingOAuthFlow(configRepository, httpClient))
         .put("airbyte/destination-snowflake", new DestinationSnowflakeOAuthFlow(configRepository, httpClient))
+        .put("airbyte/source-snowflake", new SourceSnowflakeOAuthFlow(configRepository, httpClient))
         .build();
   }
 
diff --git a/airbyte-oauth/src/main/java/io/airbyte/oauth/flows/SourceSnowflakeOAuthFlow.java b/airbyte-oauth/src/main/java/io/airbyte/oauth/flows/SourceSnowflakeOAuthFlow.java
new file mode 100644
index 00000000000000..d9c976cf5ea370
--- /dev/null
+++ b/airbyte-oauth/src/main/java/io/airbyte/oauth/flows/SourceSnowflakeOAuthFlow.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.oauth.flows;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableMap;
+import io.airbyte.commons.json.Jsons;
+import io.airbyte.config.persistence.ConfigRepository;
+import io.airbyte.oauth.BaseOAuth2Flow;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import java.util.function.Supplier;
+import org.apache.http.client.utils.URIBuilder;
+
+public class SourceSnowflakeOAuthFlow extends BaseOAuth2Flow {
+
+  private static final String AUTHORIZE_URL = "https://%s/oauth/authorize";
+  private static final String ACCESS_TOKEN_URL = "https://%s/oauth/token-request";
+
+  public SourceSnowflakeOAuthFlow(ConfigRepository configRepository, HttpClient httpClient) {
+    super(configRepository, httpClient);
+  }
+
+  @VisibleForTesting
+  public SourceSnowflakeOAuthFlow(ConfigRepository configRepository, HttpClient httpClient, final Supplier<String> stateSupplier) {
+    super(configRepository, httpClient, stateSupplier);
+  }
+
+  @Override
+  protected String formatConsentUrl(UUID definitionId,
+                                    String clientId,
+                                    String redirectUrl,
+                                    JsonNode inputOAuthConfiguration)
+      throws IOException {
+    try {
+      return new URIBuilder(String.format(AUTHORIZE_URL, extractUrl(inputOAuthConfiguration)))
+          .addParameter("client_id", clientId)
+          .addParameter("redirect_uri", redirectUrl)
+          .addParameter("response_type", "code")
+          .addParameter("state", getState())
+          .build().toString();
+    } catch (final URISyntaxException e) {
+      throw new IOException("Failed to format Consent URL for OAuth flow", e);
+    }
+  }
+
+  @Override
+  protected String getAccessTokenUrl(JsonNode inputOAuthConfiguration) {
+    return String.format(ACCESS_TOKEN_URL, extractUrl(inputOAuthConfiguration));
+  }
+
+  @Override
+  protected String extractCodeParameter(Map<String, Object> queryParams) throws IOException {
+    return super.extractCodeParameter(queryParams);
+  }
+
+  @Override
+  protected Map<String, String> getAccessTokenQueryParameters(String clientId,
+                                                              String clientSecret,
+                                                              String authCode,
+                                                              String redirectUrl) {
+    return ImmutableMap.<String, String>builder()
+        // required
+        .put("grant_type", "authorization_code")
+        .put("code", authCode)
+        .put("redirect_uri", redirectUrl)
+        .build();
+  }
+
+  @Override
+  protected Map<String, Object> completeOAuthFlow(final String clientId,
+                                                  final String clientSecret,
+                                                  final String authCode,
+                                                  final String redirectUrl,
+                                                  final JsonNode inputOAuthConfiguration,
+                                                  final JsonNode oAuthParamConfig)
+      throws IOException {
+    final var accessTokenUrl = getAccessTokenUrl(inputOAuthConfiguration);
+    final byte[] authorization = Base64.getEncoder()
+        .encode((clientId + ":" + clientSecret).getBytes(StandardCharsets.UTF_8));
+    final HttpRequest request = HttpRequest.newBuilder()
+        .POST(HttpRequest.BodyPublishers
+            .ofString(tokenReqContentType.getConverter().apply(
+                getAccessTokenQueryParameters(clientId, clientSecret, authCode, redirectUrl))))
+        .uri(URI.create(accessTokenUrl))
+        .header("Content-Type", tokenReqContentType.getContentType())
+        .header("Accept", "application/json")
+        .header("Authorization", "Basic " + new String(authorization, StandardCharsets.UTF_8))
+        .build();
+    try {
+      final HttpResponse<String> response = httpClient.send(request,
+          HttpResponse.BodyHandlers.ofString());
+
+      return extractOAuthOutput(Jsons.deserialize(response.body()), accessTokenUrl);
+    } catch (final InterruptedException e) {
+      throw new IOException("Failed to complete OAuth flow", e);
+    }
+  }
+
+  @Override
+  protected Map<String, Object> extractOAuthOutput(JsonNode data, String accessTokenUrl)
+      throws IOException {
+    final Map<String, Object> result = new HashMap<>();
+    // access_token is valid for only 10 minutes
+    if (data.has("access_token")) {
+      result.put("access_token", data.get("access_token").asText());
+    } else {
+      throw new IOException(String.format("Missing 'access_token' in query params from %s",
+          accessTokenUrl));
+    }
+
+    if (data.has("refresh_token")) {
+      result.put("refresh_token", data.get("refresh_token").asText());
+    } else {
+      throw new IOException(String.format("Missing 'refresh_token' in query params from %s",
+          accessTokenUrl));
+    }
+    if (data.has("username")) {
+      result.put("username", data.get("username").asText());
+    } else {
+      throw new IOException(String.format("Missing 'username' in query params from %s",
+          accessTokenUrl));
+    }
+    return result;
+  }
+
+  private String extractUrl(JsonNode inputOAuthConfiguration) {
+    var url = inputOAuthConfiguration.get("host");
+    return url == null ? "snowflakecomputing.com" : url.asText();
+  }
+
+}
diff --git a/airbyte-oauth/src/main/java/io/airbyte/oauth/flows/facebook/InstagramOAuthFlow.java b/airbyte-oauth/src/main/java/io/airbyte/oauth/flows/facebook/InstagramOAuthFlow.java
index c330b42980a6f7..48f72b58144a11 100644
--- a/airbyte-oauth/src/main/java/io/airbyte/oauth/flows/facebook/InstagramOAuthFlow.java
+++ b/airbyte-oauth/src/main/java/io/airbyte/oauth/flows/facebook/InstagramOAuthFlow.java
@@ -12,7 +12,7 @@
 // Instagram Graph API require Facebook API User token
 public class InstagramOAuthFlow extends FacebookMarketingOAuthFlow {
 
-  private static final String SCOPES = "ads_management,instagram_basic,instagram_manage_insights,read_insights";
+  private static final String SCOPES = "ads_management,instagram_basic,instagram_manage_insights";
 
   public InstagramOAuthFlow(final ConfigRepository configRepository, final HttpClient httpClient) {
     super(configRepository, httpClient);
diff --git a/airbyte-oauth/src/test/java/io/airbyte/oauth/flows/SnowflakeOAuthFlowTest.java b/airbyte-oauth/src/test/java/io/airbyte/oauth/flows/SnowflakeOAuthFlowTest.java
new file mode 100644
index 00000000000000..e982170807f00d
--- /dev/null
+++ b/airbyte-oauth/src/test/java/io/airbyte/oauth/flows/SnowflakeOAuthFlowTest.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.oauth.flows;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.google.common.collect.ImmutableMap;
+import io.airbyte.commons.json.Jsons;
+import io.airbyte.oauth.BaseOAuthFlow;
+import io.airbyte.oauth.MoreOAuthParameters;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+
+public class SnowflakeOAuthFlowTest extends BaseOAuthFlowTest {
+
+  @Override
+  protected BaseOAuthFlow getOAuthFlow() {
+    return new SourceSnowflakeOAuthFlow(getConfigRepository(), getHttpClient(), this::getConstantState);
+  }
+
+  @Override
+  protected String getExpectedConsentUrl() {
+    return "https://account.aws.snowflakecomputing.com/oauth/authorize?client_id=test_client_id&redirect_uri=https%3A%2F%2Fairbyte.io&response_type=code&state=state";
+  }
+
+  @Override
+  protected Map<String, String> getExpectedOutput() {
+    return Map.of(
+        "access_token", "access_token_response",
+        "refresh_token", "refresh_token_response",
+        "username", "username");
+  }
+
+  @Override
+  protected JsonNode getCompleteOAuthOutputSpecification() {
+    return getJsonSchema(Map.of("access_token", Map.of("type", "string"), "refresh_token", Map.of("type", "string")));
+  }
+
+  @Override
+  protected Map<String, String> getExpectedFilteredOutput() {
+    return Map.of(
+        "access_token", "access_token_response",
+        "refresh_token", "refresh_token_response",
+        "client_id", MoreOAuthParameters.SECRET_MASK);
+  }
+
+  protected JsonNode getOAuthParamConfig() {
+    return Jsons.jsonNode(ImmutableMap.builder()
+        .put("client_id", "test_client_id")
+        .put("client_secret", "test_client_secret")
+        .build());
+  }
+
+  @Override
+  protected JsonNode getInputOAuthConfiguration() {
+    return Jsons.jsonNode(ImmutableMap.builder()
+        .put("host", "account.aws.snowflakecomputing.com")
+        .build());
+  }
+
+  protected JsonNode getUserInputFromConnectorConfigSpecification() {
+    return getJsonSchema(Map.of("host", Map.of("type", "string")));
+  }
+
+  @Test
+  @Override
+  public void testGetSourceConsentUrlEmptyOAuthSpec() {}
+
+  @Test
+  @Override
+  public void testGetDestinationConsentUrlEmptyOAuthSpec() {}
+
+  @Test
+  @Override
+  public void testDeprecatedCompleteDestinationOAuth() {}
+
+  @Test
+  @Override
+  public void testDeprecatedCompleteSourceOAuth() {}
+
+}
diff --git a/airbyte-oauth/src/test/java/io/airbyte/oauth/flows/facebook/InstagramOAuthFlowTest.java b/airbyte-oauth/src/test/java/io/airbyte/oauth/flows/facebook/InstagramOAuthFlowTest.java
index f4ed295a230056..31cb39bc935f98 100644
--- a/airbyte-oauth/src/test/java/io/airbyte/oauth/flows/facebook/InstagramOAuthFlowTest.java
+++ b/airbyte-oauth/src/test/java/io/airbyte/oauth/flows/facebook/InstagramOAuthFlowTest.java
@@ -20,7 +20,7 @@ protected BaseOAuthFlow getOAuthFlow() {
 
   @Override
   protected String getExpectedConsentUrl() {
-    return "https://www.facebook.com/v12.0/dialog/oauth?client_id=test_client_id&redirect_uri=https%3A%2F%2Fairbyte.io&state=state&scope=ads_management%2Cinstagram_basic%2Cinstagram_manage_insights%2Cread_insights";
+    return "https://www.facebook.com/v12.0/dialog/oauth?client_id=test_client_id&redirect_uri=https%3A%2F%2Fairbyte.io&state=state&scope=ads_management%2Cinstagram_basic%2Cinstagram_manage_insights";
   }
 
   @Override
diff --git a/airbyte-scheduler/app/Dockerfile b/airbyte-scheduler/app/Dockerfile
index fd8099512cf769..b708b1982cf318 100644
--- a/airbyte-scheduler/app/Dockerfile
+++ b/airbyte-scheduler/app/Dockerfile
@@ -1,7 +1,7 @@
 ARG JDK_VERSION=17.0.1
 FROM openjdk:${JDK_VERSION}-slim AS scheduler
 
-ARG VERSION=0.36.3-alpha
+ARG VERSION=0.36.5-alpha
 
 ENV APPLICATION airbyte-scheduler
 ENV VERSION ${VERSION}
diff --git a/airbyte-server/Dockerfile b/airbyte-server/Dockerfile
index 8504029b1386b3..a6c2b94c27ca76 100644
--- a/airbyte-server/Dockerfile
+++ b/airbyte-server/Dockerfile
@@ -3,7 +3,7 @@ FROM openjdk:${JDK_VERSION}-slim AS server
 
 EXPOSE 8000
 
-ARG VERSION=0.36.3-alpha
+ARG VERSION=0.36.5-alpha
 
 ENV APPLICATION airbyte-server
 ENV VERSION ${VERSION}
diff --git a/airbyte-webapp/package-lock.json b/airbyte-webapp/package-lock.json
index e779bd55ab2039..0aa1fa28a709bf 100644
--- a/airbyte-webapp/package-lock.json
+++ b/airbyte-webapp/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "airbyte-webapp",
-  "version": "0.36.3-alpha",
+  "version": "0.36.5-alpha",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "airbyte-webapp",
-      "version": "0.36.3-alpha",
+      "version": "0.36.5-alpha",
       "dependencies": {
         "@fortawesome/fontawesome-svg-core": "^6.1.1",
         "@fortawesome/free-brands-svg-icons": "^6.1.1",
diff --git a/airbyte-webapp/package.json b/airbyte-webapp/package.json
index af16a467609a6f..1fbc245d3d6ffa 100644
--- a/airbyte-webapp/package.json
+++ b/airbyte-webapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "airbyte-webapp",
-  "version": "0.36.3-alpha",
+  "version": "0.36.5-alpha",
   "private": true,
   "engines": {
     "node": ">=16.0.0"
diff --git a/airbyte-webapp/public/images/bowtie-half.svg b/airbyte-webapp/public/images/bowtie-half.svg
new file mode 100644
index 00000000000000..48372107abbd2d
--- /dev/null
+++ b/airbyte-webapp/public/images/bowtie-half.svg
@@ -0,0 +1,31 @@
+<svg width="592" height="276" viewBox="0 0 592 276" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0_32933_157482" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="592" height="276">
+<rect y="0.220703" width="592" height="275.558" fill="url(#paint0_radial_32933_157482)"/>
+<rect x="0.5" y="0.720703" width="591" height="274.558" stroke="#FF6A4D" stroke-opacity="0.1"/>
+</mask>
+<g mask="url(#mask0_32933_157482)">
+<path d="M-8 195.817H82.3576C112.94 195.817 142.792 186.469 167.913 169.026L175.092 164.041C200.212 146.597 230.064 137.249 260.647 137.249H295.856" stroke="#FF6A4D" stroke-opacity="0.2" stroke-width="6"/>
+<path d="M-8 254.928H56.9382C102.378 254.928 145.031 233.022 171.502 196.089V196.089C197.974 159.155 240.627 137.249 286.067 137.249H295.856" stroke="#FF6A4D" stroke-opacity="0.2" stroke-width="6"/>
+<path d="M-8 225.102H68.4366C107.339 225.102 144.56 209.238 171.502 181.175V181.175C198.445 153.112 235.665 137.249 274.568 137.249H295.856" stroke="#FF6A4D" stroke-opacity="0.2" stroke-width="6"/>
+<path d="M-8 167.076H103.589C120.625 167.076 137.537 164.173 153.598 158.494L189.406 145.831C205.468 140.151 222.379 137.249 239.416 137.249H295.856" stroke="#FF6A4D" stroke-opacity="0.2" stroke-width="6"/>
+<path d="M-8 138.876H129.33L213.675 137.249H295.856" stroke="#FF6A4D" stroke-opacity="0.2" stroke-width="6"/>
+<path d="M-8 80.8498H83.7999C113.485 80.8498 142.502 89.6576 167.178 106.158L175.826 111.941C200.503 128.441 229.52 137.249 259.205 137.249H295.856" stroke="#FF6A4D" stroke-opacity="0.2" stroke-width="6"/>
+<path d="M-8 22.2814H58.0358C102.854 22.2814 144.992 43.6291 171.502 79.7652V79.7652C198.013 115.901 240.151 137.249 284.969 137.249H295.856" stroke="#FF6A4D" stroke-opacity="0.2" stroke-width="6"/>
+<path d="M-8 51.0233H69.0208C107.59 51.0233 144.532 66.5645 171.502 94.1362V94.1362C198.472 121.708 235.415 137.249 273.984 137.249H295.856" stroke="#FF6A4D" stroke-opacity="0.2" stroke-width="6"/>
+<path d="M-8 37.4655H63.7954C105.343 37.4655 144.766 55.8264 171.502 87.6283V87.6283C198.238 119.43 237.662 137.791 279.209 137.791H295.856" stroke="#FF6A4D" stroke-opacity="0.2" stroke-width="6"/>
+<path d="M-8 65.6654H74.2576C109.812 65.6654 144.395 78.4507 171.502 101.457V101.457C198.61 124.464 233.192 137.249 268.747 137.249H295.856" stroke="#FF6A4D" stroke-opacity="0.2" stroke-width="6"/>
+<path d="M-8 96.5765H95.0523C117.613 96.5765 139.884 101.666 160.206 111.465L182.799 122.36C203.121 132.16 225.391 137.249 247.952 137.249H295.856" stroke="#FF6A4D" stroke-opacity="0.2" stroke-width="6"/>
+<path d="M-8 124.234H117.825C125.484 124.234 133.131 124.82 140.701 125.988L202.304 135.494C209.873 136.662 217.521 137.249 225.18 137.249H295.856" stroke="#FF6A4D" stroke-opacity="0.2" stroke-width="6"/>
+<path d="M-8 153.518H114.996C124.53 153.518 134.043 152.609 143.405 150.803L199.6 139.964C208.962 138.158 218.474 137.249 228.009 137.249H295.856" stroke="#FF6A4D" stroke-opacity="0.2" stroke-width="6"/>
+<path d="M-8 180.091H93.4184C117.026 180.091 140.3 174.519 161.348 163.828L181.656 153.512C202.705 142.821 225.979 137.249 249.586 137.249H295.856" stroke="#FF6A4D" stroke-opacity="0.2" stroke-width="6"/>
+<path d="M-8 211.002H73.309C109.425 211.002 144.315 197.899 171.502 174.125V174.125C198.69 150.352 233.58 137.249 269.696 137.249H295.856" stroke="#FF6A4D" stroke-opacity="0.2" stroke-width="6"/>
+<path d="M-8 239.744H62.9615C104.983 239.744 144.801 220.944 171.502 188.496V188.496C198.204 156.049 238.022 137.249 280.043 137.249H295.856" stroke="#FF6A4D" stroke-opacity="0.2" stroke-width="6"/>
+<path d="M-8 110.134H105.812C121.396 110.134 136.884 112.562 151.72 117.332L191.285 130.051C206.121 134.821 221.609 137.249 237.193 137.249H295.856" stroke="#FF6A4D" stroke-opacity="0.2" stroke-width="6"/>
+</g>
+<defs>
+<radialGradient id="paint0_radial_32933_157482" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(296 138) rotate(90) scale(138 296)">
+<stop stop-color="#C4C4C4"/>
+<stop offset="1" stop-color="#C4C4C4" stop-opacity="0"/>
+</radialGradient>
+</defs>
+</svg>
diff --git a/airbyte-webapp/public/images/octavia/empty-connections.png b/airbyte-webapp/public/images/octavia/empty-connections.png
new file mode 100644
index 00000000000000..e40446edb42d8b
Binary files /dev/null and b/airbyte-webapp/public/images/octavia/empty-connections.png differ
diff --git a/airbyte-webapp/public/images/octavia/empty-destinations.png b/airbyte-webapp/public/images/octavia/empty-destinations.png
new file mode 100644
index 00000000000000..c985d0821aded0
Binary files /dev/null and b/airbyte-webapp/public/images/octavia/empty-destinations.png differ
diff --git a/airbyte-webapp/public/images/octavia/empty-sources.png b/airbyte-webapp/public/images/octavia/empty-sources.png
new file mode 100644
index 00000000000000..460ea9be388756
Binary files /dev/null and b/airbyte-webapp/public/images/octavia/empty-sources.png differ
diff --git a/airbyte-webapp/src/components/ConfirmationModal/ConfirmationModal.tsx b/airbyte-webapp/src/components/ConfirmationModal/ConfirmationModal.tsx
index 2747f956b9aaf7..5bc37008896083 100644
--- a/airbyte-webapp/src/components/ConfirmationModal/ConfirmationModal.tsx
+++ b/airbyte-webapp/src/components/ConfirmationModal/ConfirmationModal.tsx
@@ -29,6 +29,7 @@ export interface ConfirmationModalProps {
   text: string;
   submitButtonText: string;
   onSubmit: () => void;
+  submitButtonDataId?: string;
 }
 
 export const ConfirmationModal: React.FC<ConfirmationModalProps> = ({
@@ -37,6 +38,7 @@ export const ConfirmationModal: React.FC<ConfirmationModalProps> = ({
   text,
   onSubmit,
   submitButtonText,
+  submitButtonDataId,
 }) => (
   <Modal onClose={onClose} title={<FormattedMessage id={title} />}>
     <Content>
@@ -45,7 +47,7 @@ export const ConfirmationModal: React.FC<ConfirmationModalProps> = ({
         <ButtonWithMargin onClick={onClose} type="button" secondary>
           <FormattedMessage id="form.cancel" />
         </ButtonWithMargin>
-        <Button type="button" danger onClick={onSubmit}>
+        <Button type="button" danger onClick={onSubmit} data-id={submitButtonDataId}>
           <FormattedMessage id={submitButtonText} />
         </Button>
       </ButtonContent>
diff --git a/airbyte-webapp/src/components/DeleteBlock/DeleteBlock.tsx b/airbyte-webapp/src/components/DeleteBlock/DeleteBlock.tsx
index 4769a2fe519ff3..680cac1f929ec8 100644
--- a/airbyte-webapp/src/components/DeleteBlock/DeleteBlock.tsx
+++ b/airbyte-webapp/src/components/DeleteBlock/DeleteBlock.tsx
@@ -1,11 +1,12 @@
-import React, { useState } from "react";
+import React, { useCallback } from "react";
 import { FormattedMessage } from "react-intl";
 import styled from "styled-components";
 
 import { Button, H5 } from "components";
 import ContentCard from "components/ContentCard";
 
-import DeleteModal from "./components/DeleteModal";
+import { useConfirmationModalService } from "hooks/services/ConfirmationModal";
+import useRouter from "hooks/useRouter";
 
 type IProps = {
   type: "source" | "destination" | "connection";
@@ -29,7 +30,22 @@ const Text = styled.div`
 `;
 
 const DeleteBlock: React.FC<IProps> = ({ type, onDelete }) => {
-  const [isModalOpen, setIsModalOpen] = useState(false);
+  const { openConfirmationModal, closeConfirmationModal } = useConfirmationModalService();
+  const { push } = useRouter();
+
+  const onDeleteButtonClick = useCallback(() => {
+    openConfirmationModal({
+      text: `tables.${type}DeleteModalText`,
+      title: `tables.${type}DeleteConfirm`,
+      submitButtonText: "form.delete",
+      onSubmit: async () => {
+        await onDelete();
+        closeConfirmationModal();
+        push("../..");
+      },
+      submitButtonDataId: "delete",
+    });
+  }, [closeConfirmationModal, onDelete, openConfirmationModal, push, type]);
 
   return (
     <>
@@ -40,11 +56,10 @@ const DeleteBlock: React.FC<IProps> = ({ type, onDelete }) => {
           </H5>
           <FormattedMessage id={`tables.${type}DataDelete`} />
         </Text>
-        <Button danger onClick={() => setIsModalOpen(true)} data-id="open-delete-modal">
+        <Button danger onClick={onDeleteButtonClick} data-id="open-delete-modal">
           <FormattedMessage id={`tables.${type}Delete`} />
         </Button>
       </DeleteBlockComponent>
-      {isModalOpen && <DeleteModal type={type} onClose={() => setIsModalOpen(false)} onSubmit={onDelete} />}
     </>
   );
 };
diff --git a/airbyte-webapp/src/components/DeleteBlock/components/DeleteModal.tsx b/airbyte-webapp/src/components/DeleteBlock/components/DeleteModal.tsx
deleted file mode 100644
index a8a4f36859ba09..00000000000000
--- a/airbyte-webapp/src/components/DeleteBlock/components/DeleteModal.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import React from "react";
-import { FormattedMessage } from "react-intl";
-import { useMutation } from "react-query";
-import styled from "styled-components";
-
-import { Button, LoadingButton } from "components";
-import Modal from "components/Modal";
-export type IProps = {
-  onClose: () => void;
-  onSubmit: () => Promise<unknown>;
-  type: "source" | "destination" | "connection";
-};
-
-const Content = styled.div`
-  width: 585px;
-  font-size: 14px;
-  line-height: 28px;
-  padding: 10px 40px 15px 37px;
-  white-space: pre-line;
-`;
-
-const ButtonContent = styled.div`
-  padding-top: 28px;
-  display: flex;
-  justify-content: flex-end;
-`;
-
-const ButtonWithMargin = styled(Button)`
-  margin-right: 12px;
-`;
-
-const DeleteModal: React.FC<IProps> = ({ onClose, onSubmit, type }) => {
-  const { isLoading, mutateAsync } = useMutation(() => onSubmit());
-
-  return (
-    <Modal onClose={onClose} title={<FormattedMessage id={`tables.${type}DeleteConfirm`} />}>
-      <Content>
-        <FormattedMessage id={`tables.${type}DeleteModalText`} />
-        <ButtonContent>
-          <ButtonWithMargin onClick={onClose} type="button" secondary>
-            <FormattedMessage id="form.cancel" />
-          </ButtonWithMargin>
-          <LoadingButton type="button" danger isLoading={isLoading} onClick={() => mutateAsync()} data-id="delete">
-            <FormattedMessage id="form.delete" />
-          </LoadingButton>
-        </ButtonContent>
-      </Content>
-    </Modal>
-  );
-};
-
-export default DeleteModal;
diff --git a/airbyte-webapp/src/components/EmptyResourceListView/EmptyResourceListView.tsx b/airbyte-webapp/src/components/EmptyResourceListView/EmptyResourceListView.tsx
new file mode 100644
index 00000000000000..b70f0d5518060f
--- /dev/null
+++ b/airbyte-webapp/src/components/EmptyResourceListView/EmptyResourceListView.tsx
@@ -0,0 +1,96 @@
+import { useMemo } from "react";
+import { FormattedMessage } from "react-intl";
+import styled from "styled-components";
+
+import { Button, H2 } from "components/base";
+
+interface EmptyResourceListViewProps {
+  resourceType: "connections" | "destinations" | "sources";
+  onCreateClick: () => void;
+  disableCreateButton?: boolean;
+}
+
+const Container = styled.div`
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  height: 100%;
+`;
+
+export const Heading = styled(H2)`
+  font-weight: 700;
+  font-size: 24px;
+  line-height: 29px;
+  max-width: 386px;
+  text-align: center;
+  strong {
+    color: ${({ theme }) => theme.redColor};
+  }
+`;
+
+const IllustrationContainer = styled(Container)`
+  position: relative;
+  width: 592px;
+  height: 276px;
+
+  pointer-events: none;
+  user-select: none;
+`;
+
+const OctaviaImg = styled.img`
+  max-height: 203px;
+  max-width: 100%;
+  z-index: 1;
+`;
+
+export const BowtieImg = styled.img`
+  position: absolute;
+
+  &.empty-list-bowtie--right {
+    right: 0;
+    transform: scaleX(-1);
+  }
+
+  &.empty-list-bowtie--left {
+    left: 0;
+  }
+`;
+
+export const EmptyResourceListView: React.FC<EmptyResourceListViewProps> = ({
+  resourceType,
+  onCreateClick,
+  disableCreateButton,
+}) => {
+  const { headingMessageId, buttonMessageId, singularResourceType } = useMemo(() => {
+    const singularResourceType = resourceType.substring(0, resourceType.length - 1);
+    const baseMessageId = resourceType === "connections" ? singularResourceType : resourceType;
+
+    const headingMessageId = `${baseMessageId}.description`;
+    const buttonMessageId = `${baseMessageId}.new${
+      singularResourceType.substring(0, 1).toUpperCase() + singularResourceType.substring(1)
+    }`;
+
+    return { headingMessageId, buttonMessageId, singularResourceType };
+  }, [resourceType]);
+
+  return (
+    <Container>
+      <Heading>
+        <FormattedMessage id={headingMessageId} />
+      </Heading>
+      <IllustrationContainer>
+        {resourceType !== "destinations" && (
+          <BowtieImg src="/images/bowtie-half.svg" alt="Left Bowtie" className="empty-list-bowtie--left" />
+        )}
+        {resourceType !== "sources" && (
+          <BowtieImg src="/images/bowtie-half.svg" alt="Right Bowtie" className="empty-list-bowtie--right" />
+        )}
+        <OctaviaImg src={`/images/octavia/empty-${resourceType}.png`} alt="Octavia" resource={resourceType} />
+      </IllustrationContainer>
+      <Button onClick={onCreateClick} disabled={disableCreateButton} size="xl" data-id={`new-${singularResourceType}`}>
+        <FormattedMessage id={buttonMessageId} />
+      </Button>
+    </Container>
+  );
+};
diff --git a/airbyte-webapp/src/components/EmptyResourceListView/index.ts b/airbyte-webapp/src/components/EmptyResourceListView/index.ts
new file mode 100644
index 00000000000000..585fb92a64ce4c
--- /dev/null
+++ b/airbyte-webapp/src/components/EmptyResourceListView/index.ts
@@ -0,0 +1 @@
+export * from "./EmptyResourceListView";
diff --git a/airbyte-webapp/src/components/EntityTable/components/AllConnectionsStatusCell.tsx b/airbyte-webapp/src/components/EntityTable/components/AllConnectionsStatusCell.tsx
index 46b01f149e1a29..2479bb7035ec45 100644
--- a/airbyte-webapp/src/components/EntityTable/components/AllConnectionsStatusCell.tsx
+++ b/airbyte-webapp/src/components/EntityTable/components/AllConnectionsStatusCell.tsx
@@ -10,7 +10,7 @@ const _statusConfig: { status: Status; statusIconStatus?: StatusIconStatus; titl
   { status: Status.ACTIVE, statusIconStatus: "success", titleId: "connection.successSync" },
   { status: Status.INACTIVE, statusIconStatus: "inactive", titleId: "connection.disabledConnection" },
   { status: Status.FAILED, titleId: "connection.failedSync" },
-  { status: Status.EMPTY, statusIconStatus: "empty", titleId: "connection.noSyncData" },
+  { status: Status.EMPTY, statusIconStatus: "sleep", titleId: "connection.noSyncData" },
 ];
 
 interface AllConnectionStatusConnectEntity {
diff --git a/airbyte-webapp/src/components/EntityTable/components/NameCell.tsx b/airbyte-webapp/src/components/EntityTable/components/NameCell.tsx
index f9f047bd224d59..a628e9915c7855 100644
--- a/airbyte-webapp/src/components/EntityTable/components/NameCell.tsx
+++ b/airbyte-webapp/src/components/EntityTable/components/NameCell.tsx
@@ -45,7 +45,7 @@ const NameCell: React.FC<Props> = ({ value, enabled, status, icon, img }) => {
   const statusIconStatus = useMemo<StatusIconStatus | undefined>(
     () =>
       status === Status.EMPTY
-        ? "empty"
+        ? "sleep"
         : status === Status.ACTIVE
         ? "success"
         : status === Status.INACTIVE
diff --git a/airbyte-webapp/src/components/StatusIcon/StatusIcon.test.tsx b/airbyte-webapp/src/components/StatusIcon/StatusIcon.test.tsx
index 2a04b50e3865da..23f989ffac89f1 100644
--- a/airbyte-webapp/src/components/StatusIcon/StatusIcon.test.tsx
+++ b/airbyte-webapp/src/components/StatusIcon/StatusIcon.test.tsx
@@ -17,7 +17,7 @@ describe("<StatusIcon />", () => {
   const statusCases: { status: StatusIconStatus; icon: string }[] = [
     { status: "success", icon: "check" },
     { status: "inactive", icon: "pause" },
-    { status: "empty", icon: "ban" },
+    { status: "sleep", icon: "moon" },
     { status: "warning", icon: "triangle-exclamation" },
     { status: "loading", icon: "circle-loader" },
   ];
diff --git a/airbyte-webapp/src/components/StatusIcon/StatusIcon.tsx b/airbyte-webapp/src/components/StatusIcon/StatusIcon.tsx
index 9bd0b986ad6a3c..0e990344ad9b48 100644
--- a/airbyte-webapp/src/components/StatusIcon/StatusIcon.tsx
+++ b/airbyte-webapp/src/components/StatusIcon/StatusIcon.tsx
@@ -3,12 +3,14 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import React from "react";
 import styled from "styled-components";
 
+import { MoonIcon } from "components/icons/MoonIcon";
+
+import PauseIcon from "../icons/PauseIcon";
 import CircleLoader from "./CircleLoader";
-import PauseIcon from "./PauseIcon";
 
-export type StatusIconStatus = "empty" | "inactive" | "success" | "warning" | "loading";
+export type StatusIconStatus = "sleep" | "inactive" | "success" | "warning" | "loading";
 
-interface Props {
+interface StatusIconProps {
   className?: string;
   status?: StatusIconStatus;
   title?: string;
@@ -16,22 +18,22 @@ interface Props {
   value?: string | number;
 }
 
-const getBadgeWidth = (props: Props) => (props.big ? (props.value ? 57 : 40) : props.value ? 37 : 20);
+const getBadgeWidth = (props: StatusIconProps) => (props.big ? (props.value ? 57 : 40) : props.value ? 37 : 20);
 
 const _iconByStatus: Partial<Record<StatusIconStatus, IconDefinition | undefined>> = {
-  empty: faBan,
+  sleep: faBan,
   success: faCheck,
   warning: faExclamationTriangle,
 };
 
 const _themeByStatus: Partial<Record<StatusIconStatus, string>> = {
-  empty: "attentionColor",
+  sleep: "lightTextColor",
   inactive: "lightTextColor",
   success: "successColor",
   warning: "warningColor",
 };
 
-const Container = styled.div<Props>`
+const Container = styled.div<StatusIconProps>`
   width: ${(props) => getBadgeWidth(props)}px;
   height: ${({ big }) => (big ? 40 : 20)}px;
   margin-right: 10px;
@@ -39,14 +41,19 @@ const Container = styled.div<Props>`
   line-height: ${({ big }) => (big ? 33 : 12)}px;
   text-align: center;
   display: inline-block;
-  vertical-align: top;
+  vertical-align: middle;
 `;
 
-const Badge = styled(Container)<Props>`
+const Badge = styled(Container)<StatusIconProps>`
   background: ${(props) => props.theme[(props.status && _themeByStatus[props.status]) || "dangerColor"]};
   border-radius: ${({ value }) => (value ? "15px" : "50%")};
   color: ${({ theme }) => theme.whiteColor};
-  padding-top: 4px;
+  padding-top: ${({ status }) => (status === "warning" || status === "inactive" ? 3 : 4)}px;
+
+  > svg {
+    height: 1em;
+    vertical-align: -0.125em;
+  }
 `;
 
 const Value = styled.span`
@@ -56,7 +63,7 @@ const Value = styled.span`
   vertical-align: top;
 `;
 
-const StatusIcon: React.FC<Props> = ({ title, status, ...props }) => {
+const StatusIcon: React.FC<StatusIconProps> = ({ title, status, ...props }) => {
   const valueElement = props.value ? <Value>{props.value}</Value> : null;
 
   if (status === "loading") {
@@ -72,6 +79,8 @@ const StatusIcon: React.FC<Props> = ({ title, status, ...props }) => {
     <Badge {...props} status={status}>
       {status === "inactive" ? (
         <PauseIcon title={title} />
+      ) : status === "sleep" ? (
+        <MoonIcon title={title} />
       ) : (
         <FontAwesomeIcon icon={(status && _iconByStatus[status]) || faTimes} title={title} />
       )}
diff --git a/airbyte-webapp/src/components/StatusIcon/index.stories.tsx b/airbyte-webapp/src/components/StatusIcon/index.stories.tsx
new file mode 100644
index 00000000000000..c34a842db828a7
--- /dev/null
+++ b/airbyte-webapp/src/components/StatusIcon/index.stories.tsx
@@ -0,0 +1,16 @@
+import { ComponentStory, ComponentMeta } from "@storybook/react";
+
+import StatusIconComponent from "./StatusIcon";
+
+export default {
+  title: "Ui/StatusIcon",
+  component: StatusIconComponent,
+  argTypes: {},
+} as ComponentMeta<typeof StatusIconComponent>;
+
+const Template: ComponentStory<typeof StatusIconComponent> = (args) => <StatusIconComponent {...args} />;
+
+export const StatusIcon = Template.bind({});
+StatusIcon.args = {
+  status: "success",
+};
diff --git a/airbyte-webapp/src/components/base/Button/Button.tsx b/airbyte-webapp/src/components/base/Button/Button.tsx
index fb3d2c16388ebf..3e304cce814f40 100644
--- a/airbyte-webapp/src/components/base/Button/Button.tsx
+++ b/airbyte-webapp/src/components/base/Button/Button.tsx
@@ -1,9 +1,9 @@
 import styled from "styled-components";
 import { Theme } from "theme";
 
-import { IProps } from "./types";
+import { ButtonProps } from "./types";
 
-type IStyleProps = IProps & { theme: Theme };
+type IStyleProps = ButtonProps & { theme: Theme };
 
 const getBorderColor = (props: IStyleProps) => {
   if ((props.secondary && props.wasActive) || props.iconOnly) {
@@ -96,14 +96,14 @@ const getPadding = (props: IStyleProps) => {
   return "5px 16px";
 };
 
-const Button = styled.button<IProps>`
+const Button = styled.button<ButtonProps>`
   width: ${(props) => (props.full ? "100%" : "auto")};
   display: ${(props) => (props.full ? "block" : "inline-block")};
   border: 1px solid ${(props) => getBorderColor(props)};
   outline: none;
   border-radius: 4px;
   padding: ${(props) => getPadding(props)};
-  font-weight: ${(props) => (props.size === "xl" ? 300 : 500)};
+  font-weight: ${(props) => (props.size === "xl" ? 600 : 500)};
   font-size: ${(props) => getFontSize(props)}px;
   /* TODO: should try to get rid of line-height altogether */
   line-height: ${(props) => (props.size === "xl" ? "initial" : "15px")};
diff --git a/airbyte-webapp/src/components/base/Button/LoadingButton.tsx b/airbyte-webapp/src/components/base/Button/LoadingButton.tsx
index db3250d2fe557c..2c621077d5c459 100644
--- a/airbyte-webapp/src/components/base/Button/LoadingButton.tsx
+++ b/airbyte-webapp/src/components/base/Button/LoadingButton.tsx
@@ -4,7 +4,7 @@ import React from "react";
 import styled, { keyframes } from "styled-components";
 
 import Button from "./Button";
-import { IProps } from "./types";
+import { ButtonProps } from "./types";
 
 export const SpinAnimation = keyframes`
   0% {
@@ -15,7 +15,7 @@ export const SpinAnimation = keyframes`
   }
 `;
 
-const SymbolSpinner = styled(FontAwesomeIcon)<IProps>`
+const SymbolSpinner = styled(FontAwesomeIcon)<ButtonProps>`
   display: inline-block;
   font-size: 18px;
   position: absolute;
@@ -25,7 +25,7 @@ const SymbolSpinner = styled(FontAwesomeIcon)<IProps>`
   margin: -1px 0 -3px -9px;
 `;
 
-const ButtonView = styled(Button)<IProps>`
+const ButtonView = styled(Button)<ButtonProps>`
   pointer-events: none;
   background: ${({ theme }) => theme.primaryColor25};
   border-color: transparent;
@@ -36,7 +36,7 @@ const Invisible = styled.div`
   color: rgba(255, 255, 255, 0);
 `;
 
-const LoadingButton: React.FC<IProps> = (props) => {
+const LoadingButton: React.FC<ButtonProps> = (props) => {
   if (props.isLoading) {
     return (
       <ButtonView {...props}>
diff --git a/airbyte-webapp/src/components/base/Button/types.tsx b/airbyte-webapp/src/components/base/Button/types.tsx
index 39d9464de28a85..63abaa5049eb39 100644
--- a/airbyte-webapp/src/components/base/Button/types.tsx
+++ b/airbyte-webapp/src/components/base/Button/types.tsx
@@ -1,4 +1,4 @@
-export type IProps = {
+export interface ButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
   full?: boolean;
   danger?: boolean;
   secondary?: boolean;
@@ -7,4 +7,4 @@ export type IProps = {
   wasActive?: boolean;
   clickable?: boolean;
   size?: "m" | "xl";
-} & React.ButtonHTMLAttributes<HTMLButtonElement>;
+}
diff --git a/airbyte-webapp/src/components/icons/MoonIcon.tsx b/airbyte-webapp/src/components/icons/MoonIcon.tsx
new file mode 100644
index 00000000000000..6e97f0b5036c23
--- /dev/null
+++ b/airbyte-webapp/src/components/icons/MoonIcon.tsx
@@ -0,0 +1,15 @@
+interface MoonProps {
+  title?: string;
+}
+
+export const MoonIcon = ({ title }: MoonProps): JSX.Element => (
+  <svg viewBox="0 0 10 10" fill="none" role="img" data-icon="moon">
+    {title && <title>{title}</title>}
+    <path
+      fillRule="evenodd"
+      clipRule="evenodd"
+      d="M6.38 3.74396V4.31818H9.49719V3.48295H7.69996L9.50465 1.07422V0.5H6.38746V1.33523H8.18469L6.38 3.74396ZM2.75 3.49998C2.75 5.98526 4.76472 7.99998 7.25 7.99998C7.68548 7.99998 8.10652 7.93812 8.5048 7.82271C7.67992 8.84561 6.41638 9.49998 5 9.49998C2.51472 9.49998 0.5 7.48526 0.5 4.99998C0.5 2.95018 1.87052 1.22048 3.7452 0.677246C3.12269 1.44921 2.75 2.43107 2.75 3.49998Z"
+      fill="white"
+    />
+  </svg>
+);
diff --git a/airbyte-webapp/src/components/StatusIcon/PauseIcon.tsx b/airbyte-webapp/src/components/icons/PauseIcon.tsx
similarity index 80%
rename from airbyte-webapp/src/components/StatusIcon/PauseIcon.tsx
rename to airbyte-webapp/src/components/icons/PauseIcon.tsx
index a602780b309fc0..1b08b1417b2620 100644
--- a/airbyte-webapp/src/components/StatusIcon/PauseIcon.tsx
+++ b/airbyte-webapp/src/components/icons/PauseIcon.tsx
@@ -4,7 +4,7 @@ interface Props {
 }
 
 const PauseIcon = ({ color = "currentColor", title }: Props): JSX.Element => (
-  <svg width="6" height="11" viewBox="0 0 6 11" fill="none" role="img" data-icon="pause">
+  <svg viewBox="0 0 6 11" fill="none" role="img" data-icon="pause">
     {title && <title>{title}</title>}
     <line x1="1" y1="1.5" x2="1" y2="10.5" stroke={color} strokeWidth="2" />
     <line x1="5" y1="1.5" x2="5" y2="10.5" stroke={color} strokeWidth="2" />
diff --git a/airbyte-webapp/src/hooks/services/ConfirmationModal/ConfirmationModalService.tsx b/airbyte-webapp/src/hooks/services/ConfirmationModal/ConfirmationModalService.tsx
index 6b4b18ceba19f2..089effe26b5f7d 100644
--- a/airbyte-webapp/src/hooks/services/ConfirmationModal/ConfirmationModalService.tsx
+++ b/airbyte-webapp/src/hooks/services/ConfirmationModal/ConfirmationModalService.tsx
@@ -64,6 +64,7 @@ export const ConfirmationModalService = ({ children }: { children: React.ReactNo
           text={state.confirmationModal.text}
           onSubmit={state.confirmationModal.onSubmit}
           submitButtonText={state.confirmationModal.submitButtonText}
+          submitButtonDataId={state.confirmationModal.submitButtonDataId}
         />
       ) : null}
     </>
diff --git a/airbyte-webapp/src/locales/en.json b/airbyte-webapp/src/locales/en.json
index 2c1378b5b4adb2..7e6de2b13dae93 100644
--- a/airbyte-webapp/src/locales/en.json
+++ b/airbyte-webapp/src/locales/en.json
@@ -232,12 +232,13 @@
   "onboarding.syncFailed": "Your sync is failed. Please try again",
   "onboarding.startAgain": "Your sync was cancelled. You can start it again",
 
+  "sources.description": "<b>Sources</b> Sources are where you want to <b>pull data</b> from.",
   "sources.searchIncremental": "Search cursor value for incremental",
   "sources.incrementalDefault": "{value} (default)",
   "sources.incrementalSourceCursor": "Incremental - source-defined cursor",
   "sources.full_refresh": "Full refresh",
   "sources.incremental": "Incremental - based on...",
-  "sources.newSource": "+ new source",
+  "sources.newSource": "+ New source",
   "sources.newSourceTitle": "New Source",
   "sources.selectSource": "Select a source",
   "sources.status": "Status",
@@ -291,7 +292,8 @@
   "sources.lastAttempt": "Last attempt:",
 
   "destination.destinationSettings": "Destination Settings",
-  "destination.newDestination": "+ new destination",
+  "destinations.newDestination": "+ New destination",
+  "destinations.description": "<b>Destinations</b> are where you <b>send</b> or <b>push</b> your data to.",
   "destinations.noDestinations": "Destination list is empty",
   "destinations.noSources": "No sources yet",
   "destinations.addSourceReplicateData": "Add sources where to replicate data from.",
@@ -309,6 +311,7 @@
 
   "connection.warningUpdateSchema": "WARNING! Updating the schema will delete all the data for this connection in your destination and start syncing from scratch.",
   "connection.title": "Connection",
+  "connection.description": "<b>Connections</b> link Sources to Destinations.",
   "connection.fromTo": "{source} → {destination}",
   "connection.connectionSettings": "Connection settings",
   "connection.testsPassed": "All connection tests passed",
@@ -321,7 +324,7 @@
   "connection.resetData": "Reset your data",
   "connection.updateSchema": "Refresh source schema",
   "connection.updateSchemaText": "WARNING! Updating the schema will delete all the data for this connection in your destination and start syncing from scratch. Are you sure you want to do this?",
-  "connection.newConnection": "+ new connection",
+  "connection.newConnection": "+ New connection",
   "connection.newConnectionTitle": "New connection",
   "connection.noConnections": "Connection list is empty",
   "connection.disabledConnection": "Disabled connection",
diff --git a/airbyte-webapp/src/pages/ConnectionPage/pages/AllConnectionsPage/AllConnectionsPage.tsx b/airbyte-webapp/src/pages/ConnectionPage/pages/AllConnectionsPage/AllConnectionsPage.tsx
index 03f365770065f9..3a402f14589bd6 100644
--- a/airbyte-webapp/src/pages/ConnectionPage/pages/AllConnectionsPage/AllConnectionsPage.tsx
+++ b/airbyte-webapp/src/pages/ConnectionPage/pages/AllConnectionsPage/AllConnectionsPage.tsx
@@ -2,8 +2,8 @@ import React, { Suspense } from "react";
 import { FormattedMessage } from "react-intl";
 
 import { Button, LoadingPage, MainPageWithScroll, PageTitle } from "components";
+import { EmptyResourceListView } from "components/EmptyResourceListView";
 import HeadTitle from "components/HeadTitle";
-import Placeholder, { ResourceTypes } from "components/Placeholder";
 
 import { FeatureItem, useFeatureService } from "hooks/services/Feature";
 import { useConnectionList } from "hooks/services/useConnectionHook";
@@ -19,30 +19,34 @@ const AllConnectionsPage: React.FC = () => {
   const { hasFeature } = useFeatureService();
   const allowCreateConnection = hasFeature(FeatureItem.AllowCreateConnection);
 
-  const onClick = () => push(`${RoutePaths.ConnectionNew}`);
+  const onCreateClick = () => push(`${RoutePaths.ConnectionNew}`);
 
   return (
-    <MainPageWithScroll
-      headTitle={<HeadTitle titles={[{ id: "sidebar.connections" }]} />}
-      pageTitle={
-        <PageTitle
-          title={<FormattedMessage id="sidebar.connections" />}
-          endComponent={
-            <Button onClick={onClick} disabled={!allowCreateConnection}>
-              <FormattedMessage id="connection.newConnection" />
-            </Button>
+    <Suspense fallback={<LoadingPage />}>
+      {connections.length ? (
+        <MainPageWithScroll
+          headTitle={<HeadTitle titles={[{ id: "sidebar.connections" }]} />}
+          pageTitle={
+            <PageTitle
+              title={<FormattedMessage id="sidebar.connections" />}
+              endComponent={
+                <Button onClick={onCreateClick} disabled={!allowCreateConnection}>
+                  <FormattedMessage id="connection.newConnection" />
+                </Button>
+              }
+            />
           }
-        />
-      }
-    >
-      <Suspense fallback={<LoadingPage />}>
-        {connections.length ? (
+        >
           <ConnectionsTable connections={connections} />
-        ) : (
-          <Placeholder resource={ResourceTypes.Connections} />
-        )}
-      </Suspense>
-    </MainPageWithScroll>
+        </MainPageWithScroll>
+      ) : (
+        <EmptyResourceListView
+          resourceType="connections"
+          onCreateClick={onCreateClick}
+          disableCreateButton={!allowCreateConnection}
+        />
+      )}
+    </Suspense>
   );
 };
 
diff --git a/airbyte-webapp/src/pages/DestinationPage/pages/AllDestinationsPage/AllDestinationsPage.tsx b/airbyte-webapp/src/pages/DestinationPage/pages/AllDestinationsPage/AllDestinationsPage.tsx
index 63a2cd1c6ebce1..f7bbd69a248788 100644
--- a/airbyte-webapp/src/pages/DestinationPage/pages/AllDestinationsPage/AllDestinationsPage.tsx
+++ b/airbyte-webapp/src/pages/DestinationPage/pages/AllDestinationsPage/AllDestinationsPage.tsx
@@ -2,9 +2,9 @@ import React from "react";
 import { FormattedMessage } from "react-intl";
 
 import { Button, MainPageWithScroll } from "components";
+import { EmptyResourceListView } from "components/EmptyResourceListView";
 import HeadTitle from "components/HeadTitle";
 import PageTitle from "components/PageTitle";
-import Placeholder, { ResourceTypes } from "components/Placeholder";
 
 import { useDestinationList } from "hooks/services/useDestinationHook";
 import useRouter from "hooks/useRouter";
@@ -18,7 +18,7 @@ const AllDestinationsPage: React.FC = () => {
 
   const onCreateDestination = () => push(`${RoutePaths.DestinationNew}`);
 
-  return (
+  return destinations.length ? (
     <MainPageWithScroll
       headTitle={<HeadTitle titles={[{ id: "admin.destinations" }]} />}
       pageTitle={
@@ -26,18 +26,16 @@ const AllDestinationsPage: React.FC = () => {
           title={<FormattedMessage id="admin.destinations" />}
           endComponent={
             <Button onClick={onCreateDestination} data-id="new-destination">
-              <FormattedMessage id="destination.newDestination" />
+              <FormattedMessage id="destinations.newDestination" />
             </Button>
           }
         />
       }
     >
-      {destinations.length ? (
-        <DestinationsTable destinations={destinations} />
-      ) : (
-        <Placeholder resource={ResourceTypes.Destinations} />
-      )}
+      <DestinationsTable destinations={destinations} />
     </MainPageWithScroll>
+  ) : (
+    <EmptyResourceListView resourceType="destinations" onCreateClick={onCreateDestination} />
   );
 };
 
diff --git a/airbyte-webapp/src/pages/SourcesPage/pages/AllSourcesPage/AllSourcesPage.tsx b/airbyte-webapp/src/pages/SourcesPage/pages/AllSourcesPage/AllSourcesPage.tsx
index 3e47d6f4068c7c..32d75a296dc048 100644
--- a/airbyte-webapp/src/pages/SourcesPage/pages/AllSourcesPage/AllSourcesPage.tsx
+++ b/airbyte-webapp/src/pages/SourcesPage/pages/AllSourcesPage/AllSourcesPage.tsx
@@ -2,9 +2,9 @@ import React from "react";
 import { FormattedMessage } from "react-intl";
 
 import { Button, MainPageWithScroll } from "components";
+import { EmptyResourceListView } from "components/EmptyResourceListView";
 import HeadTitle from "components/HeadTitle";
 import PageTitle from "components/PageTitle";
-import Placeholder, { ResourceTypes } from "components/Placeholder";
 
 import { useSourceList } from "hooks/services/useSourceHook";
 import useRouter from "hooks/useRouter";
@@ -17,7 +17,7 @@ const AllSourcesPage: React.FC = () => {
   const { sources } = useSourceList();
 
   const onCreateSource = () => push(`${RoutePaths.SourceNew}`);
-  return (
+  return sources.length ? (
     <MainPageWithScroll
       headTitle={<HeadTitle titles={[{ id: "admin.sources" }]} />}
       pageTitle={
@@ -31,8 +31,10 @@ const AllSourcesPage: React.FC = () => {
         />
       }
     >
-      {sources.length ? <SourcesTable sources={sources} /> : <Placeholder resource={ResourceTypes.Sources} />}
+      <SourcesTable sources={sources} />
     </MainPageWithScroll>
+  ) : (
+    <EmptyResourceListView resourceType="sources" onCreateClick={onCreateSource} />
   );
 };
 
diff --git a/airbyte-webapp/src/views/Connector/ServiceForm/components/Sections/auth/GoogleAuthButton.tsx b/airbyte-webapp/src/views/Connector/ServiceForm/components/Sections/auth/GoogleAuthButton.tsx
index b23bd04d92a31c..75efe97b826d75 100644
--- a/airbyte-webapp/src/views/Connector/ServiceForm/components/Sections/auth/GoogleAuthButton.tsx
+++ b/airbyte-webapp/src/views/Connector/ServiceForm/components/Sections/auth/GoogleAuthButton.tsx
@@ -1,9 +1,9 @@
 import React from "react";
 import styled from "styled-components";
 
-import { IProps } from "components/base/Button/types";
+import { ButtonProps } from "components/base/Button/types";
 
-const StyledButton = styled.button<IProps>`
+const StyledButton = styled.button<ButtonProps>`
   align-items: center;
   background: #4285f4;
   border: 0 solid #4285f4;
diff --git a/airbyte-workers/Dockerfile b/airbyte-workers/Dockerfile
index 3300fb0b083cd3..8c2b9da37ecc73 100644
--- a/airbyte-workers/Dockerfile
+++ b/airbyte-workers/Dockerfile
@@ -25,7 +25,7 @@ RUN curl -fsSLo /usr/share/keyrings/kubernetes-archive-keyring.gpg https://packa
 RUN echo "deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main" | tee /etc/apt/sources.list.d/kubernetes.list
 RUN apt-get update && apt-get install -y kubectl
 
-ARG VERSION=0.36.3-alpha
+ARG VERSION=0.36.5-alpha
 
 ENV APPLICATION airbyte-workers
 ENV VERSION ${VERSION}
diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/ConnectionUpdaterInput.java b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/ConnectionUpdaterInput.java
index 55c3baa7d38c2e..59b4369db7551b 100644
--- a/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/ConnectionUpdaterInput.java
+++ b/airbyte-workers/src/main/java/io/airbyte/workers/temporal/scheduling/ConnectionUpdaterInput.java
@@ -38,6 +38,7 @@ public class ConnectionUpdaterInput {
   @Nullable
   private WorkflowState workflowState;
   private boolean resetConnection;
+  @Builder.Default
   private boolean fromJobResetFailure = false;
 
 }
diff --git a/charts/airbyte/Chart.yaml b/charts/airbyte/Chart.yaml
index 81a2129c32a96c..ace0f2c1c0d490 100644
--- a/charts/airbyte/Chart.yaml
+++ b/charts/airbyte/Chart.yaml
@@ -21,7 +21,7 @@ version: 0.3.1
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.36.3-alpha"
+appVersion: "0.36.5-alpha"
 
 dependencies:
   - name: common
diff --git a/charts/airbyte/README.md b/charts/airbyte/README.md
index 2638d0a19dee20..e7bbf27c282391 100644
--- a/charts/airbyte/README.md
+++ b/charts/airbyte/README.md
@@ -31,7 +31,7 @@ Helm charts for Airbyte.
 | `webapp.replicaCount`                       | Number of webapp replicas                                        | `1`              |
 | `webapp.image.repository`                   | The repository to use for the airbyte webapp image.              | `airbyte/webapp` |
 | `webapp.image.pullPolicy`                   | the pull policy to use for the airbyte webapp image              | `IfNotPresent`   |
-| `webapp.image.tag`                          | The airbyte webapp image tag. Defaults to the chart's AppVersion | `0.36.3-alpha`  |
+| `webapp.image.tag`                          | The airbyte webapp image tag. Defaults to the chart's AppVersion | `0.36.5-alpha`  |
 | `webapp.podAnnotations`                     | Add extra annotations to the webapp pod(s)                       | `{}`             |
 | `webapp.containerSecurityContext`           | Security context for the container                               | `{}`             |
 | `webapp.livenessProbe.enabled`              | Enable livenessProbe on the webapp                               | `true`           |
@@ -73,7 +73,7 @@ Helm charts for Airbyte.
 | `scheduler.replicaCount`       | Number of scheduler replicas                                        | `1`                 |
 | `scheduler.image.repository`   | The repository to use for the airbyte scheduler image.              | `airbyte/scheduler` |
 | `scheduler.image.pullPolicy`   | the pull policy to use for the airbyte scheduler image              | `IfNotPresent`      |
-| `scheduler.image.tag`          | The airbyte scheduler image tag. Defaults to the chart's AppVersion | `0.36.3-alpha`      |
+| `scheduler.image.tag`          | The airbyte scheduler image tag. Defaults to the chart's AppVersion | `0.36.5-alpha`      |
 | `scheduler.podAnnotations`     | Add extra annotations to the scheduler pod                          | `{}`                |
 | `scheduler.resources.limits`   | The resources limits for the scheduler container                    | `{}`                |
 | `scheduler.resources.requests` | The requested resources for the scheduler container                 | `{}`                |
@@ -120,7 +120,7 @@ Helm charts for Airbyte.
 | `server.replicaCount`                       | Number of server replicas                                        | `1`              |
 | `server.image.repository`                   | The repository to use for the airbyte server image.              | `airbyte/server` |
 | `server.image.pullPolicy`                   | the pull policy to use for the airbyte server image              | `IfNotPresent`   |
-| `server.image.tag`                          | The airbyte server image tag. Defaults to the chart's AppVersion | `0.36.3-alpha`   |
+| `server.image.tag`                          | The airbyte server image tag. Defaults to the chart's AppVersion | `0.36.5-alpha`   |
 | `server.podAnnotations`                     | Add extra annotations to the server pod                          | `{}`             |
 | `server.containerSecurityContext`           | Security context for the container                               | `{}`             |
 | `server.livenessProbe.enabled`              | Enable livenessProbe on the server                               | `true`           |
@@ -158,7 +158,7 @@ Helm charts for Airbyte.
 | `worker.replicaCount`                       | Number of worker replicas                                        | `1`              |
 | `worker.image.repository`                   | The repository to use for the airbyte worker image.              | `airbyte/worker` |
 | `worker.image.pullPolicy`                   | the pull policy to use for the airbyte worker image              | `IfNotPresent`   |
-| `worker.image.tag`                          | The airbyte worker image tag. Defaults to the chart's AppVersion | `0.36.3-alpha`   |
+| `worker.image.tag`                          | The airbyte worker image tag. Defaults to the chart's AppVersion | `0.36.5-alpha`   |
 | `worker.podAnnotations`                     | Add extra annotations to the worker pod(s)                       | `{}`             |
 | `worker.containerSecurityContext`           | Security context for the container                               | `{}`             |
 | `worker.livenessProbe.enabled`              | Enable livenessProbe on the worker                               | `true`           |
@@ -190,7 +190,7 @@ Helm charts for Airbyte.
 | ----------------------------- | -------------------------------------------------------------------- | -------------------- |
 | `bootloader.image.repository` | The repository to use for the airbyte bootloader image.              | `airbyte/bootloader` |
 | `bootloader.image.pullPolicy` | the pull policy to use for the airbyte bootloader image              | `IfNotPresent`       |
-| `bootloader.image.tag`        | The airbyte bootloader image tag. Defaults to the chart's AppVersion | `0.36.3-alpha`       |
+| `bootloader.image.tag`        | The airbyte bootloader image tag. Defaults to the chart's AppVersion | `0.36.5-alpha`       |
 
 
 ### Temporal parameters
diff --git a/charts/airbyte/values.yaml b/charts/airbyte/values.yaml
index 4a19a4c4b0a25b..1e445caba5dfa2 100644
--- a/charts/airbyte/values.yaml
+++ b/charts/airbyte/values.yaml
@@ -43,7 +43,7 @@ webapp:
   image:
     repository: airbyte/webapp
     pullPolicy: IfNotPresent
-    tag: 0.36.3-alpha
+    tag: 0.36.5-alpha
 
   ## @param webapp.podAnnotations [object] Add extra annotations to the webapp pod(s)
   ##
@@ -209,7 +209,7 @@ scheduler:
   image:
     repository: airbyte/scheduler
     pullPolicy: IfNotPresent
-    tag: 0.36.3-alpha
+    tag: 0.36.5-alpha
 
   ## @param scheduler.podAnnotations [object] Add extra annotations to the scheduler pod
   ##
@@ -440,7 +440,7 @@ server:
   image:
     repository: airbyte/server
     pullPolicy: IfNotPresent
-    tag: 0.36.3-alpha
+    tag: 0.36.5-alpha
 
   ## @param server.podAnnotations [object] Add extra annotations to the server pod
   ##
@@ -581,7 +581,7 @@ worker:
   image:
     repository: airbyte/worker
     pullPolicy: IfNotPresent
-    tag: 0.36.3-alpha
+    tag: 0.36.5-alpha
 
   ## @param worker.podAnnotations [object] Add extra annotations to the worker pod(s)
   ##
@@ -699,7 +699,7 @@ bootloader:
   image:
     repository: airbyte/bootloader
     pullPolicy: IfNotPresent
-    tag: 0.36.3-alpha
+    tag: 0.36.5-alpha
 
   ## @param bootloader.podAnnotations [object] Add extra annotations to the bootloader pod
   ##
diff --git a/docs/integrations/destinations/postgres.md b/docs/integrations/destinations/postgres.md
index be0f79a2db0f03..f5ad3a0656ec47 100644
--- a/docs/integrations/destinations/postgres.md
+++ b/docs/integrations/destinations/postgres.md
@@ -1,37 +1,34 @@
 # Postgres
 
-## Features
+This page guides you through the process of setting up the Postgres destination connector.
 
-| Feature | Supported?\(Yes/No\) | Notes |
-| :--- | :--- | :--- |
-| Full Refresh Sync | Yes |  |
-| Incremental - Append Sync | Yes |  |
-| Incremental - Deduped History | Yes |  |
-| Namespaces | Yes |  |
+## Prerequisites
 
-#### Output Schema
-
-Each stream will be output into its own table in Postgres. Each table will contain 3 columns:
-
-* `_airbyte_ab_id`: a uuid assigned by Airbyte to each event that is processed. The column type in Postgres is `VARCHAR`.
-* `_airbyte_emitted_at`: a timestamp representing when the event was pulled from the data source. The column type in Postgres is `TIMESTAMP WITH TIME ZONE`.
-* `_airbyte_data`: a json blob representing with the event data. The column type in Postgres is `JSONB`.
-
-## Getting Started \(Airbyte Cloud\)
+To use the Postgres destination, you'll need:
 
-Airbyte Cloud only supports connecting to your Postgres instance with SSL or TLS encryption. TLS is used by default. Other than that, you can proceed with the open-source instructions below.
+* A Postgres server version 9.5 or above
 
-## Getting Started \(Airbyte Open-Source\)
+Airbyte Cloud only supports connecting to your Postgres instances with SSL or TLS encryption. TLS is
+used by default. Other than that, you can proceed with the open-source instructions below.
 
-#### Requirements
+You'll need the following information to configure the Postgres destination:
 
-To use the Postgres destination, you'll need:
+* **Host** - The host name of the server.
+* **Port** - The port number the server is listening on. Defaults to the PostgreSQL™ standard port number (5432).
+* **Username**
+* **Password**
+* **Default Schema Name** - Specify the schema (or several schemas separated by commas) to be set in the search-path. These schemas will be used to resolve unqualified object names used in statements executed over this connection.
+* **Database** - The database name. The default is to connect to a database with the same name as the user name.
+* **JDBC URL Params** (optional)
 
-* A Postgres server version 9.5 or above
+[Refer to this guide for more details](https://jdbc.postgresql.org/documentation/head/connect.html)
 
 #### Configure Network Access
 
-Make sure your Postgres database can be accessed by Airbyte. If your database is within a VPC, you may need to allow access from the IP you're using to expose Airbyte.
+Make sure your Postgres database can be accessed by Airbyte. If your database is within a VPC, you
+may need to allow access from the IP you're using to expose Airbyte.
+
+## Step 1: Set up Postgres
 
 #### **Permissions**
 
@@ -49,50 +46,95 @@ GRANT CREATE, TEMPORARY ON DATABASE <database> TO airbyte_user;
 
 You can also use a pre-existing user but we highly recommend creating a dedicated user for Airbyte.
 
+## Step 2: Set up the Postgres connector in Airbyte
+
 #### Target Database
 
-You will need to choose an existing database or create a new database that will be used to store synced data from Airbyte.
+You will need to choose an existing database or create a new database that will be used to store
+synced data from Airbyte.
 
-### Setup the Postgres Destination in Airbyte
+## Naming Conventions
 
-You should now have all the requirements needed to configure Postgres as a destination in the UI. You'll need the following information to configure the Postgres destination:
+From [Postgres SQL Identifiers syntax](https://www.postgresql.org/docs/9.0/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS):
 
-* **Host**
-* **Port**
-* **Username**
-* **Password**
-* **Default Schema Name**
-* **Database**
-* **JDBC URL Params** (optional)
+* SQL identifiers and key words must begin with a letter \(a-z, but also letters with diacritical
+  marks and non-Latin letters\) or an underscore \(\_\).
+* Subsequent characters in an identifier or key word can be letters, underscores, digits \(0-9\), or
+  dollar signs \($\).
 
+  Note that dollar signs are not allowed in identifiers according to the SQL standard,
+  so their use might render applications less portable. The SQL standard will not define a key word
+  that contains digits or starts or ends with an underscore, so identifiers of this form are safe
+  against possible conflict with future extensions of the standard.
 
-## Naming Conventions
+* The system uses no more than NAMEDATALEN-1 bytes of an identifier; longer names can be written in
+  commands, but they will be truncated. By default, NAMEDATALEN is 64 so the maximum identifier
+  length is 63 bytes
+* Quoted identifiers can contain any character, except the character with code zero. \(To include a
+  double quote, write two double quotes.\) This allows constructing table or column names that would
+  otherwise not be possible, such as ones containing spaces or ampersands. The length limitation
+  still applies.
+* Quoting an identifier also makes it case-sensitive, whereas unquoted names are always folded to
+  lower case.
+* In order to make your applications portable and less error-prone, use consistent quoting with each name (either always quote it or never quote it).
+
+Note, that Airbyte Postgres destination will create tables and schemas using the Unquoted
+identifiers when possible or fallback to Quoted Identifiers if the names are containing special
+characters.
+
+**For Airbyte Cloud:**
+
+1. [Log into your Airbyte Cloud](https://cloud.airbyte.io/workspaces) account.
+2. In the left navigation bar, click **Destinations**. In the top-right corner, click **new destination**.
+3. On the Set up the destination page, enter the name for the Postgres connector
+   and select **Postgres** from the Destination type dropdown.
+4. Follow the [Setup the Postgres Destination in Airbyte](postgres.md#Setup-the-Postgres-Destination-in-Airbyte)
+
+## Supported sync modes
+
+The Postgres destination connector supports the
+following[ sync modes](https://docs.airbyte.com/cloud/core-concepts#connection-sync-modes):
+
+| Feature | Supported?\(Yes/No\) | Notes |
+| :--- | :--- | :--- |
+| Full Refresh Sync | Yes |  |
+| Incremental - Append Sync | Yes |  |
+| Incremental - Deduped History | Yes |  |
+| Namespaces | Yes |  |
+
+## Schema map
+
+#### Output Schema
+
+Each stream will be mapped to a separate table in Postgres. Each table will contain 3 columns:
+
+* `_airbyte_ab_id`: a uuid assigned by Airbyte to each event that is processed. The column type in
+  Postgres is `VARCHAR`.
+* `_airbyte_emitted_at`: a timestamp representing when the event was pulled from the data source.
+  The column type in Postgres is `TIMESTAMP WITH TIME ZONE`.
+* `_airbyte_data`: a json blob representing with the event data. The column type in Postgres
+  is `JSONB`.
 
-From [Postgres SQL Identifiers syntax](https://www.postgresql.org/docs/9.0/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS):
 
-* SQL identifiers and key words must begin with a letter \(a-z, but also letters with diacritical marks and non-Latin letters\) or an underscore \(\_\).
-* Subsequent characters in an identifier or key word can be letters, underscores, digits \(0-9\), or dollar signs \($\).
+## Tutorials
+Now that you have set up the Postgres destination connector, check out the following tutorials:
 
-  Note that dollar signs are not allowed in identifiers according to the letter of the SQL standard, so their use might render applications less portable. The SQL standard will not define a key word that contains digits or starts or ends with an underscore, so identifiers of this form are safe against possible conflict with future extensions of the standard.
+* [Migrate from mysql to postgres](https://airbyte.com/tutorials/migrate-from-mysql-to-postgresql)
+* [Postgres replication](https://airbyte.com/tutorials/postgres-replication)
 
-* The system uses no more than NAMEDATALEN-1 bytes of an identifier; longer names can be written in commands, but they will be truncated. By default, NAMEDATALEN is 64 so the maximum identifier length is 63 bytes
-* Quoted identifiers can contain any character, except the character with code zero. \(To include a double quote, write two double quotes.\) This allows constructing table or column names that would otherwise not be possible, such as ones containing spaces or ampersands. The length limitation still applies.
-* Quoting an identifier also makes it case-sensitive, whereas unquoted names are always folded to lower case.
-* If you want to write portable applications you are advised to always quote a particular name or never quote it.
 
-Therefore, Airbyte Postgres destination will create tables and schemas using the Unquoted identifiers when possible or fallback to Quoted Identifiers if the names are containing special characters.
 
 ## Changelog
 
-| Version | Date       | Pull Request | Subject                                                                                             |
-|:--------|:-----------| :--- |:----------------------------------------------------------------------------------------------------|
+| Version | Date | Pull Request | Subject                                                                                             |
+|:--------| :--- | :--- |:----------------------------------------------------------------------------------------------------|
 | 0.3.19  | 2022-04-25 | [12195](https://github.com/airbytehq/airbyte/pull/12195) | Add support for additional JDBC URL Params input                                                    |
 | 0.3.18  | 2022-04-12 | [11729](https://github.com/airbytehq/airbyte/pull/11514) | Bump mina-sshd from 2.7.0 to 2.8.0                                                                  |
-| 0.3.17  | 2022-04-05 | [11729](https://github.com/airbytehq/airbyte/pull/11729) | Fixed bug with dashes in schema name                                                                |
+| 0.3.17  | 2022-04-05 | [11729](https://github.com/airbytehq/airbyte/pull/11729) | Fixed bug with dashes in schema name                                                                   |
 | 0.3.15  | 2022-02-25 | [10421](https://github.com/airbytehq/airbyte/pull/10421) | Refactor JDBC parameters handling                                                                   |
 | 0.3.14  | 2022-02-14 | [10256](https://github.com/airbytehq/airbyte/pull/10256) | (unpublished) Add `-XX:+ExitOnOutOfMemoryError` JVM option                                          |
 | 0.3.13  | 2021-12-01 | [8371](https://github.com/airbytehq/airbyte/pull/8371) | Fixed incorrect handling "\n" in ssh key                                                            |
-| 0.3.12  | 2021-11-08 | [#7719](https://github.com/airbytehq/airbyte/pull/7719) | Improve handling of wide rows by buffering records based on their byte size rather than their count |
-| 0.3.11  | 2021-09-07 | [\#5743](https://github.com/airbytehq/airbyte/pull/5743) | Add SSH Tunnel support                                                                              |
-| 0.3.10  | 2021-08-11 | [\#5336](https://github.com/airbytehq/airbyte/pull/5336) | 🐛 Destination Postgres: fix \u0000\(NULL\) value processing                                        |
+| 0.3.12  | 2021-11-08 | [7719](https://github.com/airbytehq/airbyte/pull/7719) | Improve handling of wide rows by buffering records based on their byte size rather than their count |
+| 0.3.11  | 2021-09-07 | [5743](https://github.com/airbytehq/airbyte/pull/5743) | Add SSH Tunnel support                                                                              |
+| 0.3.10  | 2021-08-11 | [5336](https://github.com/airbytehq/airbyte/pull/5336) | Destination Postgres: fix \u0000\(NULL\) value processing                                        |
 
diff --git a/docs/integrations/destinations/redshift.md b/docs/integrations/destinations/redshift.md
index 8339f8e7c8ecee..6dd424fdaa3db4 100644
--- a/docs/integrations/destinations/redshift.md
+++ b/docs/integrations/destinations/redshift.md
@@ -1,124 +1,139 @@
 # Redshift
 
-## Overview
+This page guides you through the process of setting up the Redshift destination connector.
+
+## Prerequisites
 
 The Airbyte Redshift destination allows you to sync data to Redshift.
 
 This Redshift destination connector has two replication strategies:
 
 1. INSERT: Replicates data via SQL INSERT queries. This is built on top of the destination-jdbc code base and is configured to rely on JDBC 4.2 standard drivers provided by Amazon via Mulesoft [here](https://mvnrepository.com/artifact/com.amazon.redshift/redshift-jdbc42) as described in Redshift documentation [here](https://docs.aws.amazon.com/redshift/latest/mgmt/jdbc20-install.html). **Not recommended for production workloads as this does not scale well**.
-2. COPY: Replicates data by first uploading data to an S3 bucket and issuing a COPY command. This is the recommended loading approach described by Redshift [best practices](https://docs.aws.amazon.com/redshift/latest/dg/c_loading-data-best-practices.html). Requires an S3 bucket and credentials.
-
-Airbyte automatically picks an approach depending on the given configuration - if S3 configuration is present, Airbyte will use the COPY strategy and vice versa.
-
-We recommend users use INSERT for testing, to avoid any additional setup, and switch to COPY for production workloads.
-
-### Sync overview
-
-#### Output schema
-
-Each stream will be output into its own raw table in Redshift. Each table will contain 3 columns:
-
-* `_airbyte_ab_id`: a uuid assigned by Airbyte to each event that is processed. The column type in Redshift is `VARCHAR`.
-* `_airbyte_emitted_at`: a timestamp representing when the event was pulled from the data source. The column type in Redshift is `TIMESTAMP WITH TIME ZONE`.
-* `_airbyte_data`: a json blob representing with the event data. The column type in Redshift is `VARCHAR` but can be be parsed with JSON functions.
-
-#### Features
 
-| Feature | Supported?\(Yes/No\) | Notes |
-| :--- | :--- | :--- |
-| Full Refresh Sync | Yes |  |
-| Incremental - Append Sync | Yes |  |
-| Incremental - Deduped History | Yes |  |
-| Namespaces | Yes |  |
-| SSL Support | Yes |  |
+For INSERT strategy:
+* **Host**
+* **Port**
+* **Username**
+* **Password**
+* **Schema**
+* **Database**
+    * This database needs to exist within the cluster provided.
 
-#### Target Database
+2. COPY: Replicates data by first uploading data to an S3 bucket and issuing a COPY command. This is the recommended loading approach described by Redshift [best practices](https://docs.aws.amazon.com/redshift/latest/dg/c_loading-data-best-practices.html). Requires an S3 bucket and credentials.
 
-You will need to choose an existing database or create a new database that will be used to store synced data from Airbyte.
+Airbyte automatically picks an approach depending on the given configuration - if S3 configuration is present, Airbyte will use the COPY strategy and vice versa.
 
-## Getting started
+For COPY strategy:
 
-### Requirements
+* **S3 Bucket Name**
+    * See [this](https://docs.aws.amazon.com/AmazonS3/latest/userguide/create-bucket-overview.html) to create an S3 bucket.
+* **S3 Bucket Region**
+    * Place the S3 bucket and the Redshift cluster in the same region to save on networking costs.
+* **Access Key Id**
+    * See [this](https://docs.aws.amazon.com/general/latest/gr/aws-sec-cred-types.html#access-keys-and-secret-access-keys) on how to generate an access key.
+    * We recommend creating an Airbyte-specific user. This user will require [read and write permissions](https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies_examples_s3_rw-bucket.html) to objects in the staging bucket.
+* **Secret Access Key**
+    * Corresponding key to the above key id.
+* **Part Size**
+    * Affects the size limit of an individual Redshift table. Optional. Increase this if syncing tables larger than 100GB. Files are streamed to S3 in parts. This determines the size of each part, in MBs. As S3 has a limit of 10,000 parts per file, part size affects the table size. This is 10MB by default, resulting in a default table limit of 100GB. Note, a larger part size will result in larger memory requirements. A rule of thumb is to multiply the part size by 10 to get the memory requirement. Modify this with care.
 
-1. Active Redshift cluster
-2. Allow connections from Airbyte to your Redshift cluster \(if they exist in separate VPCs\)
-3. A staging S3 bucket with credentials \(for the COPY strategy\).
+Optional parameters:
+* **Bucket Path**
+    * The directory within the S3 bucket to place the staging data. For example, if you set this to `yourFavoriteSubdirectory`, we will place the staging data inside `s3://yourBucket/yourFavoriteSubdirectory`. If not provided, defaults to the root directory.
+* **Purge Staging Data**
+    * Whether to delete the staging files from S3 after completing the sync. Specifically, the connector will create CSV files named `bucketPath/namespace/streamName/syncDate_epochMillis_randomUuid.csv` containing three columns (`ab_id`, `data`, `emitted_at`). Normally these files are deleted after the `COPY` command completes; if you want to keep them for other purposes, set `purge_staging_data` to `false`.
 
-:::info
 
-Even if your Airbyte instance is running on a server in the same VPC as your Redshift cluster, you may need to place them in the **same security group** to allow connections between the two.
+## Step 1: Set up Redshift
 
-:::
+1. [Log in](https://aws.amazon.com/console/) to AWS Management console.
+   If you don't have a AWS account already, you’ll need to [create](https://aws.amazon.com/premiumsupport/knowledge-center/create-and-activate-aws-account/) one in order to use the API.
+2. Go to the AWS Redshift service
+3. [Create](https://docs.aws.amazon.com/ses/latest/dg/event-publishing-redshift-cluster.html) and activate AWS Redshift cluster if you don't have one ready
+4. (Optional) [Allow](https://aws.amazon.com/premiumsupport/knowledge-center/cannot-connect-redshift-cluster/) connections from Airbyte to your Redshift cluster \(if they exist in separate VPCs\)
+5. (Optional) [Create](https://docs.aws.amazon.com/AmazonS3/latest/userguide/create-bucket-overview.html) a staging S3 bucket \(for the COPY strategy\).
 
-### Setup guide
+## Step 2: Set up the destination connector in Airbyte
 
-#### 1. Make sure your cluster is active and accessible from the machine running Airbyte
+**For Airbyte Cloud:**
 
-This is dependent on your networking setup. The easiest way to verify if Airbyte is able to connect to your Redshift cluster is via the check connection tool in the UI. You can check AWS Redshift documentation with a tutorial on how to properly configure your cluster's access [here](https://docs.aws.amazon.com/redshift/latest/gsg/rs-gsg-authorize-cluster-access.html)
+1. [Log into your Airbyte Cloud](https://cloud.airbyte.io/workspaces) account.
+2. In the left navigation bar, click **Destinations**. In the top-right corner, click **+ new destination**.
+3. On the destination setup page, select **Redshift** from the Destination type dropdown and enter a name for this connector.
+4. Fill in all the required fields to use the INSERT or COPY strategy
+5. Click `Set up destination`.
 
-#### 2. Fill up connection info
+**For Airbyte OSS:**
 
-Next is to provide the necessary information on how to connect to your cluster such as the `host` whcih is part of the connection string or Endpoint accessible [here](https://docs.aws.amazon.com/redshift/latest/gsg/rs-gsg-connect-to-cluster.html#rs-gsg-how-to-get-connection-string) without the `port` and `database` name \(it typically includes the cluster-id, region and end with `.redshift.amazonaws.com`\).
+1. Go to local Airbyte page.
+2. In the left navigation bar, click **Destinations**. In the top-right corner, click **+ new destination**.
+3. On the destination setup page, select **Redshift** from the Destination type dropdown and enter a name for this connector.
+4. Fill in all the required fields to use the INSERT or COPY strategy
+5. Click `Set up destination`.
 
-You should have all the requirements needed to configure Redshift as a destination in the UI. You'll need the following information to configure the destination:
 
-* **Host**
-* **Port**
-* **Username**
-* **Password**
-* **Schema**
-* **Database**
-  * This database needs to exist within the cluster provided.
+## Supported sync modes
 
-#### 2a. Fill up S3 info \(for COPY strategy\)
+The Redshift destination connector supports the following [sync modes](https://docs.airbyte.com/cloud/core-concepts/#connection-sync-mode):
+- Full Refresh
+- Incremental - Append Sync
+- Incremental - Deduped History
 
-Provide the required S3 info.
+## Performance considerations
 
-* **S3 Bucket Name**
-  * See [this](https://docs.aws.amazon.com/AmazonS3/latest/userguide/create-bucket-overview.html) to create an S3 bucket.
-* **S3 Bucket Region**
-  * Place the S3 bucket and the Redshift cluster in the same region to save on networking costs.
-* **Access Key Id**
-  * See [this](https://docs.aws.amazon.com/general/latest/gr/aws-sec-cred-types.html#access-keys-and-secret-access-keys) on how to generate an access key.
-  * We recommend creating an Airbyte-specific user. This user will require [read and write permissions](https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies_examples_s3_rw-bucket.html) to objects in the staging bucket.
-* **Secret Access Key**
-  * Corresponding key to the above key id.
-* **Part Size**
-  * Affects the size limit of an individual Redshift table. Optional. Increase this if syncing tables larger than 100GB. Files are streamed to S3 in parts. This determines the size of each part, in MBs. As S3 has a limit of 10,000 parts per file, part size affects the table size. This is 10MB by default, resulting in a default table limit of 100GB. Note, a larger part size will result in larger memory requirements. A rule of thumb is to multiply the part size by 10 to get the memory requirement. Modify this with care.
+Synchronization performance depends on the amount of data to be transferred.
+Cluster scaling issues can be resolved directly using the cluster settings in the AWS Redshift console
 
-Optional parameters:
-* **Bucket Path**
-  * The directory within the S3 bucket to place the staging data. For example, if you set this to `yourFavoriteSubdirectory`, we will place the staging data inside `s3://yourBucket/yourFavoriteSubdirectory`. If not provided, defaults to the root directory.
-* **Purge Staging Data**
-  * Whether to delete the staging files from S3 after completing the sync. Specifically, the connector will create CSV files named `bucketPath/namespace/streamName/syncDate_epochMillis_randomUuid.csv` containing three columns (`ab_id`, `data`, `emitted_at`). Normally these files are deleted after the `COPY` command completes; if you want to keep them for other purposes, set `purge_staging_data` to `false`.
+## Connector-specific features & highlights
 
-## Notes about Redshift Naming Conventions
+### Notes about Redshift Naming Conventions
 
 From [Redshift Names & Identifiers](https://docs.aws.amazon.com/redshift/latest/dg/r_names.html):
 
-### Standard Identifiers
+#### Standard Identifiers
 
 * Begin with an ASCII single-byte alphabetic character or underscore character, or a UTF-8 multibyte character two to four bytes long.
 * Subsequent characters can be ASCII single-byte alphanumeric characters, underscores, or dollar signs, or UTF-8 multibyte characters two to four bytes long.
 * Be between 1 and 127 bytes in length, not including quotation marks for delimited identifiers.
 * Contain no quotation marks and no spaces.
 
-### Delimited Identifiers
+#### Delimited Identifiers
 
 Delimited identifiers \(also known as quoted identifiers\) begin and end with double quotation marks \("\). If you use a delimited identifier, you must use the double quotation marks for every reference to that object. The identifier can contain any standard UTF-8 printable characters other than the double quotation mark itself. Therefore, you can create column or table names that include otherwise illegal characters, such as spaces or the percent symbol. ASCII letters in delimited identifiers are case-insensitive and are folded to lowercase. To use a double quotation mark in a string, you must precede it with another double quotation mark character.
 
 Therefore, Airbyte Redshift destination will create tables and schemas using the Unquoted identifiers when possible or fallback to Quoted Identifiers if the names are containing special characters.
 
-## Data Size Limitations
+### Data Size Limitations
 
 Redshift specifies a maximum limit of 65535 bytes to store the raw JSON record data. Thus, when a row is too big to fit, the Redshift destination fails to load such data and currently ignores that record.
 See [docs](https://docs.aws.amazon.com/redshift/latest/dg/r_Character_types.html)
 
-## Encryption
+### Encryption
 
 All Redshift connections are encrypted using SSL
 
+### Output schema
+
+Each stream will be output into its own raw table in Redshift. Each table will contain 3 columns:
+
+* `_airbyte_ab_id`: a uuid assigned by Airbyte to each event that is processed. The column type in Redshift is `VARCHAR`.
+* `_airbyte_emitted_at`: a timestamp representing when the event was pulled from the data source. The column type in Redshift is `TIMESTAMP WITH TIME ZONE`.
+* `_airbyte_data`: a json blob representing with the event data. The column type in Redshift is `VARCHAR` but can be be parsed with JSON functions.
+
+## Data type mapping
+
+| Redshift Type | Airbyte Type | Notes |
+| :--- | :--- | :--- |
+| `boolean` | `boolean` | |
+| `int` | `integer` | |
+| `float` | `number` | |
+| `varchar` | `string` | |
+| `date/varchar` | `date` | |
+| `time/varchar` | `time` | |
+| `timestamptz/varchar` | `timestamp_with_timezone` | |
+| `varchar` | `array` | |
+| `varchar` | `object` | |
+
 ## Changelog
 
 | Version | Date       | Pull Request | Subject |
@@ -142,3 +157,4 @@ All Redshift connections are encrypted using SSL
 | 0.3.12  | 2021-07-21 | [3555](https://github.com/airbytehq/airbyte/pull/3555) | Enable partial checkpointing for halfway syncs |
 | 0.3.11  | 2021-07-20 | [4874](https://github.com/airbytehq/airbyte/pull/4874) | allow `additionalProperties` in connector spec |
 
+
diff --git a/docs/integrations/sources/amazon-ads.md b/docs/integrations/sources/amazon-ads.md
index 766b6946fa05e6..65af43664364a3 100644
--- a/docs/integrations/sources/amazon-ads.md
+++ b/docs/integrations/sources/amazon-ads.md
@@ -59,10 +59,11 @@ Information about expected report generation waiting time you may find [here](ht
 * client\_id
 * client\_secret
 * refresh\_token
-* scope
-* profiles
 * region
+* report\_wait\_timeout
+* report\_generation\_max\_retries
 * start\_date \(optional\)
+* profiles \(optional\)
 
 More how to get client\_id and client\_secret you can find on [AWS docs](https://advertising.amazon.com/API/docs/en-us/setting-up/step-1-create-lwa-app).
 
@@ -76,6 +77,7 @@ Start date used for generating reports starting from the specified start date. S
 
 | Version | Date | Pull Request | Subject |
 | :--- | :--- | :--- | :--- |
+| `0.1.7` | 2022-04-27 | [\#11730](https://github.com/airbytehq/airbyte/pull/11730) | Update fields in source-connectors specifications |
 | `0.1.6` | 2022-04-20 | [\#11659](https://github.com/airbytehq/airbyte/pull/11659) | Add adId to products report |
 | `0.1.5` | 2022-04-08 | [\#11430](https://github.com/airbytehq/airbyte/pull/11430) | `Added support OAuth2.0` |
 | `0.1.4` | 2022-02-21 | [\#10513](https://github.com/airbytehq/airbyte/pull/10513) | `Increasing REPORT_WAIT_TIMEOUT for supporting report generation which takes longer time ` |
diff --git a/docs/integrations/sources/amplitude.md b/docs/integrations/sources/amplitude.md
index 8039e147b80e8d..93384fd00613d2 100644
--- a/docs/integrations/sources/amplitude.md
+++ b/docs/integrations/sources/amplitude.md
@@ -45,6 +45,7 @@ Please read [How to get your API key and Secret key](https://help.amplitude.com/
 
 | Version | Date       | Pull Request                                           | Subject |
 | :------ | :--------- | :----------------------------------------------------- | :------ |
+| 0.1.5   | 2022-04-28 | [12430](https://github.com/airbytehq/airbyte/pull/12430) | Added HTTP error descriptions and fixed `Events` stream fail caused by `404` HTTP Error |
 | 0.1.4   | 2021-12-23 | [8434](https://github.com/airbytehq/airbyte/pull/8434) | Update fields in source-connectors specifications |
 | 0.1.3   | 2021-10-12 | [6375](https://github.com/airbytehq/airbyte/pull/6375) | Log Transient 404 Error in Events stream  |
 | 0.1.2   | 2021-09-21 | [6353](https://github.com/airbytehq/airbyte/pull/6353) | Correct output schemas on cohorts, events, active\_users, and average\_session\_lengths streams |
diff --git a/docs/integrations/sources/apify-dataset.md b/docs/integrations/sources/apify-dataset.md
index dbd4473494adc8..1390e4e3633997 100644
--- a/docs/integrations/sources/apify-dataset.md
+++ b/docs/integrations/sources/apify-dataset.md
@@ -43,6 +43,7 @@ The Apify dataset connector uses [Apify Python Client](https://docs.apify.com/ap
 
 | Version | Date | Pull Request | Subject |
 | :--- | :--- | :--- | :--- |
+| 0.1.11 | 2022-04-27 | [12397](https://github.com/airbytehq/airbyte/pull/12397) | No changes. Used connector to test publish workflow changes. |
 | 0.1.9 | 2022-04-05 | [PR\#11712](https://github.com/airbytehq/airbyte/pull/11712) | No changes from 0.1.4. Used connector to test publish workflow changes. |
 | 0.1.4 | 2021-12-23 | [PR\#8434](https://github.com/airbytehq/airbyte/pull/8434) | Update fields in source-connectors specifications |
 | 0.1.2 | 2021-11-08 | [PR\#7499](https://github.com/airbytehq/airbyte/pull/7499) | Remove base-python dependencies |
diff --git a/docs/integrations/sources/freshdesk.md b/docs/integrations/sources/freshdesk.md
index 7e8b2c224f5a11..ee2eeb8d80cb6c 100644
--- a/docs/integrations/sources/freshdesk.md
+++ b/docs/integrations/sources/freshdesk.md
@@ -51,11 +51,11 @@ Please read [How to find your API key](https://support.freshdesk.com/support/sol
 
 ## Changelog
 
-| Version | Date       | Pull Request | Subject                                                                        |
-|:--------|:-----------| :--- |:-------------------------------------------------------------------------------|
-| 0.2.11  | 2021-12-14 | [8682](https://github.com/airbytehq/airbyte/pull/8682) | Migrate to the CDK                                                             |
-| 0.2.10  | 2021-12-06 | [8524](https://github.com/airbytehq/airbyte/pull/8524) | Update connector fields title/description                                      |
-| 0.2.9   | 2021-11-16 | [8017](https://github.com/airbytehq/airbyte/pull/8017) | Bugfix an issue that caused the connector not to sync more than 50000 contacts |
-| 0.2.8   | 2021-10-28 | [7486](https://github.com/airbytehq/airbyte/pull/7486) | Include "requester" and "stats" fields in "tickets" stream                     |
-| 0.2.7   | 2021-10-13 | [6442](https://github.com/airbytehq/airbyte/pull/6442) | Add start_date parameter to specification from which to start pulling data.    |
+| Version | Date       | Pull Request                                             | Subject                                                                        |
+|:--------|:-----------|:---------------------------------------------------------|:-------------------------------------------------------------------------------|
+| 0.2.11  | 2021-12-14 | [8682](https://github.com/airbytehq/airbyte/pull/8682)   | Migrate to the CDK                                                             |
+| 0.2.10  | 2021-12-06 | [8524](https://github.com/airbytehq/airbyte/pull/8524)   | Update connector fields title/description                                      |
+| 0.2.9   | 2021-11-16 | [8017](https://github.com/airbytehq/airbyte/pull/8017)   | Bugfix an issue that caused the connector not to sync more than 50000 contacts |
+| 0.2.8   | 2021-10-28 | [7486](https://github.com/airbytehq/airbyte/pull/7486)   | Include "requester" and "stats" fields in "tickets" stream                     |
+| 0.2.7   | 2021-10-13 | [6442](https://github.com/airbytehq/airbyte/pull/6442)   | Add start_date parameter to specification from which to start pulling data.    |
 
diff --git a/docs/integrations/sources/google-ads.md b/docs/integrations/sources/google-ads.md
index 68adfc021679e5..c6c2b1a38deafe 100644
--- a/docs/integrations/sources/google-ads.md
+++ b/docs/integrations/sources/google-ads.md
@@ -8,12 +8,12 @@ If you don't already have a developer token from Google Ads, make sure you follo
 
 ## Features
 
-| Feature | Supported? |
-| :--- | :--- |
-| Full Refresh Sync | Yes |
-| Incremental Sync | Yes |
-| Replicate Incremental Deletes | No |
-| SSL connection | Yes |
+| Feature                       | Supported? |
+| :---------------------------- | :--------- |
+| Full Refresh Sync             | Yes        |
+| Incremental Sync              | Yes        |
+| Replicate Incremental Deletes | No         |
+| SSL connection                | Yes        |
 
 ## Supported Tables
 
@@ -21,27 +21,27 @@ This source is capable of syncing the following tables and their data:
 
 ### Main Tables
 
-* [accounts](https://developers.google.com/google-ads/api/fields/v8/customer)
-* [ad\_group\_ads](https://developers.google.com/google-ads/api/fields/v8/ad_group_ad)
-* [ad\_group\_ad\_labels](https://developers.google.com/google-ads/api/fields/v8/ad_group_ad_label)
-* [ad\_groups](https://developers.google.com/google-ads/api/fields/v8/ad_group)
-* [ad\_group\_labels](https://developers.google.com/google-ads/api/fields/v8/ad_group_label)
-* [campaigns](https://developers.google.com/google-ads/api/fields/v8/campaign)
-* [campaign\_labels](https://developers.google.com/google-ads/api/fields/v8/campaign_label)
-* [click\_view](https://developers.google.com/google-ads/api/reference/rpc/v8/ClickView)
-* [keyword](https://developers.google.com/google-ads/api/fields/v8/keyword_view)
-* [geographic](https://developers.google.com/google-ads/api/fields/v8/geographic_view)
+- [accounts](https://developers.google.com/google-ads/api/fields/v8/customer)
+- [ad_group_ads](https://developers.google.com/google-ads/api/fields/v8/ad_group_ad)
+- [ad_group_ad_labels](https://developers.google.com/google-ads/api/fields/v8/ad_group_ad_label)
+- [ad_groups](https://developers.google.com/google-ads/api/fields/v8/ad_group)
+- [ad_group_labels](https://developers.google.com/google-ads/api/fields/v8/ad_group_label)
+- [campaigns](https://developers.google.com/google-ads/api/fields/v8/campaign)
+- [campaign_labels](https://developers.google.com/google-ads/api/fields/v8/campaign_label)
+- [click_view](https://developers.google.com/google-ads/api/reference/rpc/v8/ClickView)
+- [keyword](https://developers.google.com/google-ads/api/fields/v8/keyword_view)
+- [geographic](https://developers.google.com/google-ads/api/fields/v8/geographic_view)
 
 Note that `ad_groups`, `ad_group_ads`, and `campaigns` contain a `labels` field, which should be joined against their respective `*_labels` streams if you want to view the actual labels. For example, the `ad_groups` stream contains an `ad_group.labels` field, which you would join against the `ad_group_labels` stream's `label.resource_name` field.
 
 ### Report Tables
 
-* [account\_performance\_report](https://developers.google.com/google-ads/api/docs/migration/mapping#account_performance)
-* [ad\_group\_ad\_report](https://developers.google.com/google-ads/api/docs/migration/mapping#ad_performance)
-* [display\_keyword\_report](https://developers.google.com/google-ads/api/docs/migration/mapping#display_keyword_performance)
-* [display\_topics\_report](https://developers.google.com/google-ads/api/docs/migration/mapping#display_topics_performance)
-* [shopping\_performance\_report](https://developers.google.com/google-ads/api/docs/migration/mapping#shopping_performance)
-* [user_location_report](https://developers.google.com/google-ads/api/fields/v8/user_location_view)
+- [account_performance_report](https://developers.google.com/google-ads/api/docs/migration/mapping#account_performance)
+- [ad_group_ad_report](https://developers.google.com/google-ads/api/docs/migration/mapping#ad_performance)
+- [display_keyword_report](https://developers.google.com/google-ads/api/docs/migration/mapping#display_keyword_performance)
+- [display_topics_report](https://developers.google.com/google-ads/api/docs/migration/mapping#display_topics_performance)
+- [shopping_performance_report](https://developers.google.com/google-ads/api/docs/migration/mapping#shopping_performance)
+- [user_location_report](https://developers.google.com/google-ads/api/fields/v8/user_location_view)
 
 **Note**: Due to constraints from the Google Ads API, the `click_view` stream retrieves data one day at a time and can only retrieve data newer than 90 days ago
 
@@ -64,13 +64,14 @@ Note that `ad_groups`, `ad_group_ads`, and `campaigns` contain a `labels` field,
 Google Ads Account with an approved Developer Token. \(note: In order to get API access to Google Ads, you must have a "manager" account; standard accounts cannot generate a Developer Token. This manager account must be created separately from your standard account. You can find more information about this distinction in the [Google Ads docs](https://support.google.com/google-ads/answer/6139186).\)
 
 You'll need to find these values. See the [setup guide](#setup-guide) for instructions.
-* developer\_token
-* client\_id
-* client\_secret
-* refresh\_token
-* start\_date
-* customer\_id
-* login\_customer\_id \(you can find more information about this field in [Google Ads docs](https://developers.google.com/google-ads/api/docs/concepts/call-structure#cid)\)
+
+- developer_token
+- client_id
+- client_secret
+- refresh_token
+- start_date
+- customer_id
+- login_customer_id \(you can find more information about this field in [Google Ads docs](https://developers.google.com/google-ads/api/docs/concepts/call-structure#cid)\)
 
 ### Setup guide
 
@@ -79,7 +80,7 @@ This guide will provide information as if starting from scratch. Please skip ove
 1. Create an Google Ads Account. Here are [Google's instruction](https://support.google.com/google-ads/answer/6366720) on how to create one.
 2. Create an Google Ads MANAGER Account. Here are [Google's instruction](https://ads.google.com/home/tools/manager-accounts/) on how to create one.
 3. You should now have two Google Ads accounts: a normal account and a manager account. Link the Manager account to the normal account following [Google's documentation](https://support.google.com/google-ads/answer/7459601).
-4. Apply for a developer token \(**make sure you follow our** [**instructions**](google-ads.md#how-to-apply-for-the-developer-token)\) on your Manager account.  This token allows you to access your data from the Google Ads API. Here are [Google's instructions](https://developers.google.com/google-ads/api/docs/first-call/dev-token). The docs are a little unclear on this point, but you will _not_ be able to access your data via the Google Ads API until this token is approved. You cannot use a test developer token, it has to be at least a basic developer token. It usually takes Google 24 hours to respond to these applications. This developer token is the value you will use in the `developer_token` field.
+4. Apply for a developer token \(**make sure you follow our** [**instructions**](google-ads.md#how-to-apply-for-the-developer-token)\) on your Manager account. This token allows you to access your data from the Google Ads API. Here are [Google's instructions](https://developers.google.com/google-ads/api/docs/first-call/dev-token). The docs are a little unclear on this point, but you will _not_ be able to access your data via the Google Ads API until this token is approved. You cannot use a test developer token, it has to be at least a basic developer token. It usually takes Google 24 hours to respond to these applications. This developer token is the value you will use in the `developer_token` field.
 5. Fetch your `client_id`, `client_secret`, and `refresh_token`. Google provides [instructions](https://developers.google.com/google-ads/api/docs/first-call/overview) on how to do this.
 6. Select your `customer_id`. The `customer_id` refers to the id of each of your Google Ads accounts. This is the 10 digit number in the top corner of the page when you are in Google Ads UI. The source will only pull data from the accounts for which you provide an id. If you are having trouble finding it, check out [Google's instructions](https://support.google.com/google-ads/answer/1704344).
 
@@ -91,10 +92,10 @@ Google is very picky about which software and which use case can get access to a
 
 When you apply for a token, you need to mention:
 
-* Why you need the token \(eg: want to run some internal analytics...\)
-* That you will be using the Airbyte Open Source project
-* That you have full access to the code base \(because we're open source\)
-* That you have full access to the server running the code \(because you're self-hosting Airbyte\)
+- Why you need the token \(eg: want to run some internal analytics...\)
+- That you will be using the Airbyte Open Source project
+- That you have full access to the code base \(because we're open source\)
+- That you have full access to the server running the code \(because you're self-hosting Airbyte\)
 
 #### Understanding Google Ads Query Language
 
@@ -106,9 +107,10 @@ This source is constrained by whatever API limits are set for the Google Ads tha
 
 ## CHANGELOG
 
-| Version  | Date       | Pull Request | Subject                                                                                      |
-|:---------|:-----------| :--- |:---------------------------------------------------------------------------------------------|
-| `0.1.35` | 2022-04-18 | [9310](https://github.com/airbytehq/airbyte/pull/9310) | Add new fields to reports                                                       |
+| Version  | Date       | Pull Request                                             | Subject                                                                                      |
+| :------- | :--------- | :------------------------------------------------------- | :------------------------------------------------------------------------------------------- |
+| `0.1.36` | 2022-04-19 | [12158](https://github.com/airbytehq/airbyte/pull/12158) | Fix `*_labels` streams data type                                                             |
+| `0.1.35` | 2022-04-18 | [9310](https://github.com/airbytehq/airbyte/pull/9310)   | Add new fields to reports                                                                    |
 | `0.1.34` | 2022-03-29 | [11602](https://github.com/airbytehq/airbyte/pull/11602) | Add budget amount to campaigns stream.                                                       |
 | `0.1.33` | 2022-03-29 | [11513](https://github.com/airbytehq/airbyte/pull/11513) | When `end_date` is configured in the future, use today's date instead.                       |
 | `0.1.32` | 2022-03-24 | [11371](https://github.com/airbytehq/airbyte/pull/11371) | Improve how connection check returns error messages                                          |
diff --git a/docs/integrations/sources/hubspot.md b/docs/integrations/sources/hubspot.md
index ffabe35eca3df0..353218e67d6142 100644
--- a/docs/integrations/sources/hubspot.md
+++ b/docs/integrations/sources/hubspot.md
@@ -147,6 +147,9 @@ If you are using OAuth, most of the streams require the appropriate [scopes](htt
 
 | Version | Date       | Pull Request                                             | Subject                                                                                                                                        |
 |:--------|:-----------|:---------------------------------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------|
+| 0.1.55  | 2022-04-28 | [12424](https://github.com/airbytehq/airbyte/pull/12424) | Correct schema for ticket_pipeline stream                                                                                               |
+| 0.1.54  | 2022-04-28 | [12335](https://github.com/airbytehq/airbyte/pull/12335) | Mock time slep in unit test s                                                                                              |
+| 0.1.53  | 2022-04-20 | [12230](https://github.com/airbytehq/airbyte/pull/12230) | chaneg spec json to yaml format                                                                                                |
 | 0.1.52  | 2022-03-25 | [11423](https://github.com/airbytehq/airbyte/pull/11423) | Add tickets associations to engagements streams                                                                                                |
 | 0.1.51  | 2022-03-24 | [11321](https://github.com/airbytehq/airbyte/pull/11321) | Fix updated at field non exists issue                                                                                                     |
 | 0.1.50  | 2022-03-22 | [11266](https://github.com/airbytehq/airbyte/pull/11266) | Fix Engagements Stream Pagination                                                                                                       |
diff --git a/docs/integrations/sources/mixpanel.md b/docs/integrations/sources/mixpanel.md
index 0882c750b282b5..debb8bb54f0295 100644
--- a/docs/integrations/sources/mixpanel.md
+++ b/docs/integrations/sources/mixpanel.md
@@ -59,6 +59,7 @@ Select the correct region \(EU or US\) for your Mixpanel project. See detail [he
 
 | Version  | Date       | Pull Request                                             | Subject                                                                                              |
 |:---------|:-----------|:---------------------------------------------------------|:-----------------------------------------------------------------------------------------------------|
+| `0.1.13` | 2022-04-27 | [12335](https://github.com/airbytehq/airbyte/pull/12335) | Adding fixtures to mock time.sleep for connectors that explicitly sleep                              |  
 | `0.1.12` | 2022-03-31 | [11633](https://github.com/airbytehq/airbyte/pull/11633) | Increase unit test coverage                                                                          |  
 | `0.1.11` | 2022-04-04 | [11318](https://github.com/airbytehq/airbyte/pull/11318) | Change Response Reading                                                                              |
 | `0.1.10` | 2022-03-31 | [11227](https://github.com/airbytehq/airbyte/pull/11227) | Fix cohort id always null in the cohort_members stream                                               |
diff --git a/docs/integrations/sources/openweather.md b/docs/integrations/sources/openweather.md
index dba899a2e39d21..8609d916597b3b 100644
--- a/docs/integrations/sources/openweather.md
+++ b/docs/integrations/sources/openweather.md
@@ -34,5 +34,6 @@ The free plan allows 60 calls per minute and 1,000,000 calls per month, you won'
 
 | Version | Date | Pull Request | Subject |
 | :--- | :--- | :--- | :--- |
+| 0.1.4 | 2022-04-27 | [12397](https://github.com/airbytehq/airbyte/pull/12397) | No changes. Used connector to test publish workflow changes. |
 | 0.1.0 | 2021-10-27 | [7434](https://github.com/airbytehq/airbyte/pull/7434) | Initial release |
 
diff --git a/docs/integrations/sources/paypal-transaction.md b/docs/integrations/sources/paypal-transaction.md
index 55ee494452151e..f633d83e220ace 100644
--- a/docs/integrations/sources/paypal-transaction.md
+++ b/docs/integrations/sources/paypal-transaction.md
@@ -55,11 +55,12 @@ Transactions sync is performed with default `stream_slice_period` = 1 day, it me
 
 ## Changelog
 
-| Version | Date | Pull Request | Subject |
-| :--- | :--- | :--- | :--- |
-| 0.1.4 | 2021-12-22 | [9034](https://github.com/airbytehq/airbyte/pull/9034) | Update connector fields title/description |
-| 0.1.3 | 2021-12-16 | [8580](https://github.com/airbytehq/airbyte/pull/8580) | Added more logs during `check connection` stage |
-| 0.1.2 | 2021-11-08 | [7499](https://github.com/airbytehq/airbyte/pull/7499) | Remove base-python dependencies |
-| 0.1.1 | 2021-08-03 | [5155](https://github.com/airbytehq/airbyte/pull/5155) | fix start\_date\_min limit |
-| 0.1.0 | 2021-06-10 | [4240](https://github.com/airbytehq/airbyte/pull/4240) | PayPal Transaction Search API |
+| Version | Date       | Pull Request                                             | Subject                                                                 |
+|:--------|:-----------|:---------------------------------------------------------|:------------------------------------------------------------------------|
+| 0.1.5   | 2022-04-27 | [12335](https://github.com/airbytehq/airbyte/pull/12335) | Adding fixtures to mock time.sleep for connectors that explicitly sleep |
+| 0.1.4   | 2021-12-22 | [9034](https://github.com/airbytehq/airbyte/pull/9034)   | Update connector fields title/description                               |
+| 0.1.3   | 2021-12-16 | [8580](https://github.com/airbytehq/airbyte/pull/8580)   | Added more logs during `check connection` stage                         |
+| 0.1.2   | 2021-11-08 | [7499](https://github.com/airbytehq/airbyte/pull/7499)   | Remove base-python dependencies                                         |
+| 0.1.1   | 2021-08-03 | [5155](https://github.com/airbytehq/airbyte/pull/5155)   | fix start\_date\_min limit                                              |
+| 0.1.0   | 2021-06-10 | [4240](https://github.com/airbytehq/airbyte/pull/4240)   | PayPal Transaction Search API                                           |
 
diff --git a/docs/integrations/sources/salesforce.md b/docs/integrations/sources/salesforce.md
index 951fb528360ad7..a0987ad172078d 100644
--- a/docs/integrations/sources/salesforce.md
+++ b/docs/integrations/sources/salesforce.md
@@ -121,7 +121,8 @@ Now that you have set up the Salesforce source connector, check out the followin
 ## Changelog
 
 | Version | Date       | Pull Request | Subject                                                                                                                          |
-|:--------|:-----------| :--- |:---------------------------------------------------------------------------------------------------------------------------------|
+|:--------|:-----------|:---|:---------------------------------------------------------------------------------------------------------------------------------|
+| 1.0.4 | 2022-04-27 | [12335](https://github.com/airbytehq/airbyte/pull/12335) | Adding fixtures to mock time.sleep for connectors that explicitly sleep |
 | 1.0.3 | 2022-04-04 | [11692](https://github.com/airbytehq/airbyte/pull/11692) | Optimised memory usage for `BULK` API calls |
 | 1.0.2 | 2022-03-01 | [10751](https://github.com/airbytehq/airbyte/pull/10751) | Fix broken link anchor in connector configuration |
 | 1.0.1 | 2022-02-27 | [10679](https://github.com/airbytehq/airbyte/pull/10679) | Reorganize input parameter order on the UI |
diff --git a/docs/integrations/sources/smartsheets.md b/docs/integrations/sources/smartsheets.md
index afdf7682f02d80..f06e8a20df8afa 100644
--- a/docs/integrations/sources/smartsheets.md
+++ b/docs/integrations/sources/smartsheets.md
@@ -1,92 +1,94 @@
 # Smartsheets
 
-### Table of Contents
+This page guides you through the process of setting up the Smartsheets source connector.
 
-* [Sync Details](smartsheets.md#sync-details)
-  * [Column datatype mapping](smartsheets.md#column-datatype-mapping)
-  * [Features](smartsheets.md#Features)
-  * [Performance Considerations](smartsheets.md#performance-considerations)
-* [Getting Started](smartsheets.md#getting-started)
-  * [Requirements](smartsheets.md#requirements)
-  * [Setup Guide](smartsheets.md#setup-guide)
-  * [Configuring the source in the Airbyte UI](smartsheets.md#configuring-the-source-in-the-airbyte-ui)
+## Prerequisites
 
-## Sync Details
-
-The Smartsheet Source is written to pull data from a single Smartsheet spreadsheet. Unlike Google Sheets, Smartsheets only allows one sheet per Smartsheet - so a given Airbyte connector instance can sync only one sheet at a time.
-
-To replicate multiple spreadsheets, you can create multiple instances of the Smartsheet Source in Airbyte, reusing the API token for all your sheets that you need to sync.
-
-**Note: Column headers must contain only alphanumeric characters or `_` , as specified in the** [**Airbyte Protocol**](../../understanding-airbyte/airbyte-specification.md).
+To configure the Smartsheet Source for syncs, you'll need the following:
 
-### Column datatype mapping
+* A Smartsheets API access token - generated by a Smartsheets user with at least **read** access
+* The ID of the spreadsheet you'd like to sync
 
-The data type mapping adopted by this connector is based on the Smartsheet [documentation](https://smartsheet.redoc.ly/tag/columnsRelated#section/Column-Types).
+## Step 1: Set up Smartsheets
 
-**NOTE**: For any column datatypes interpreted by Smartsheets beside `DATE` and `DATETIME`, this connector's source schema generation assumes a `string` type, in which case the `format` field is not required by Airbyte.
+### Obtain a Smartsheets API access token
 
-| Integration Type | Airbyte Type | Airbyte Format       |
-|:-----------------|:-------------|:---------------------|
-| `TEXT_NUMBER`    | `string`     |                      |
-| `DATE`           | `string`     | `format: date`       |
-| `DATETIME`       | `string`     | `format: date-time`  |
-| `anything else`  | `string`     |                      |
+You can generate an API key for your account from a session of your Smartsheet webapp by clicking:
 
-The remaining column datatypes supported by Smartsheets are more complex types \(e.g. Predecessor, Dropdown List\) and are not supported by this connector beyond its `string` representation.
+* Account (top-right icon)
+* Apps & Integrations
+* API Access
+* Generate new access token
 
-### Features
+For questions on advanced authorization flows, refer to [this](https://www.smartsheet.com/content-center/best-practices/tips-tricks/api-getting-started).
 
-This source connector only supports Full Refresh Sync. Since Smartsheets only allows 5000 rows per sheet, it's likely that the Full Refresh Sync Mode will suit the majority of use-cases.
+### Prepare the spreadsheet ID of your Smartsheet
 
-| Feature           | Supported? |
-|:------------------|:-----------|
-| Full Refresh Sync | Yes        |
-| Incremental Sync  | No         |
-| Namespaces        | No         |
+You'll also need the ID of the Spreadsheet you'd like to sync. Unlike Google Sheets, this ID is not found in the URL. You can find the required spreadsheet ID from your Smartsheet app session by going to:
 
-### Performance considerations
+* File
+* Properties
 
-At the time of writing, the [Smartsheets API rate limit](https://developers.smartsheet.com/blog/smartsheet-api-best-practices#:~:text=The%20Smartsheet%20API%20currently%20imposes,per%20minute%20per%20Access%20Token.) is 300 requests per minute per API access token. This connector makes 6 API calls per sync operation.
+## Step 2: Set up the Smartsheets connector in Airbyte
 
-## Getting started
+**For Airbyte Cloud:**
 
-### Requirements
+1. [Log into your Airbyte Cloud](https://cloud.airbyte.io/workspaces) account.
+2. In the left navigation bar, click Sources. In the top-right corner, click **+new source**.
+3. On the Set up the source page, enter the name for the Smartsheets connector and select **Smartsheets** from the Source type dropdown.
+4. Authenticate via OAuth2.0 using the API access token from Prerequisites
+5. Enter the start date and the ID of the spreadsheet you want to sync
+6. Submit the form
 
-To configure the Smartsheet Source for syncs, you'll need the following:
+**For Airbyte OSS:**
+1. Navigate to the Airbute Open Source dashboard
+2. Set the name for your source
+3. Enter the API access token from Prerequisites
+4. Enter the ID of the spreadsheet you want to sync
+5. Enter a start sync date
+6. Click **Set up source**
 
-* A Smartsheets API access token - generated by a Smartsheets user with at least **read** access
-* The ID of the spreadsheet you'd like to sync
+## Supported sync modes
 
-### Setup guide
+The Smartsheets source connector supports the following[ sync modes](https://docs.airbyte.com/cloud/core-concepts#connection-sync-modes):
+ - Full Refresh | Overwrite
+ - Full Refresh | Append
+ - Incremental  | Append
+ - Incremental  | Deduped
 
-#### Obtain a Smartsheets API access token
+## Performance considerations
 
-You can generate an API key for your account from a session of your Smartsheet webapp by clicking:
+At the time of writing, the [Smartsheets API rate limit](https://developers.smartsheet.com/blog/smartsheet-api-best-practices#be-practical-adhere-to-rate-limiting-guidelines) is 300 requests per minute per API access token.
 
-* Account \(top-right icon\)
-* Apps & Integrations
-* API Access
-* Generate new access token
+## Supported streams
 
-For questions on advanced authorization flows, refer to [this](https://www.smartsheet.com/content-center/best-practices/tips-tricks/api-getting-started).
+This source provides a single stream per spreadsheet with a dynamic schema, depending on your spreadsheet structure.
+For example, having a spreadsheet `Customers`, the connector would introduce a stream with the same name and properties typed according to Data type map (see [below](https://docs.airbyte.com/integrations/sources/smartsheets/#data-type-map)).
 
-#### The spreadsheet ID of your Smartsheet
+## Important highlights
+The Smartsheet Source is written to pull data from a single Smartsheet spreadsheet. Unlike Google Sheets, Smartsheets only allows one sheet per Smartsheet - so a given Airbyte connector instance can sync only one sheet at a time. To replicate multiple spreadsheets, you can create multiple instances of the Smartsheet Source in Airbyte, reusing the API token for all your sheets that you need to sync.
 
-You'll also need the ID of the Spreadsheet you'd like to sync. Unlike Google Sheets, this ID is not found in the URL. You can find the required spreadsheet ID from your Smartsheet app session by going to:
+**Note: Column headers must contain only alphanumeric characters or `_` , as specified in the** [**Airbyte Protocol**](../../understanding-airbyte/airbyte-specification.md).
 
-* File
-* Properties
+## Data type map
+The data type mapping adopted by this connector is based on the Smartsheet [documentation](https://smartsheet-platform.github.io/api-docs/index.html?python#column-types).
 
-### Configuring the source in the Airbyte UI
+**NOTE**: For any column datatypes interpreted by Smartsheets beside `DATE` and `DATETIME`, this connector's source schema generation assumes a `string` type, in which case the `format` field is not required by Airbyte.
 
-To setup your new Smartsheets source, Airbyte will need:
+| Integration Type | Airbyte Type | Airbyte Format       |
+|:-----------------|:-------------|:---------------------|
+| `TEXT_NUMBER`    | `string`     |                      |
+| `DATE`           | `string`     | `format: date`       |
+| `DATETIME`       | `string`     | `format: date-time`  |
+| `anything else`  | `string`     |                      |
 
-1. Your API access token
-2. The spreadsheet ID
+The remaining column datatypes supported by Smartsheets are more complex types (e.g. Predecessor, Dropdown List) and are not supported by this connector beyond its `string` representation.
 
 ## Changelog
 
-| Version | Date       | Pull Request                                             | Subject                   |
-|:--------|:-----------|:---------------------------------------------------------|:--------------------------|
-| 0.1.9   | 2022-04-12 | [11911](https://github.com/airbytehq/airbyte/pull/11911) | Bugfix: scrambled columns |
-| 0.1.8   | 2022-02-04 | [9792](https://github.com/airbytehq/airbyte/pull/9792)   | Added oauth support       |
+| Version | Date       | Pull Request                                             | Subject                                                   |
+|:--------|:-----------|:---------------------------------------------------------|:----------------------------------------------------------|
+| 0.1.11  | 2022-04-27 | [12203](https://github.com/airbytehq/airbyte/pull/12203) | Doc improvements                                          |
+| 0.1.10  | 2022-04-15 | [12077](https://github.com/airbytehq/airbyte/pull/12077) | Implement incremental read and improve code test coverage |
+| 0.1.9   | 2022-04-12 | [11911](https://github.com/airbytehq/airbyte/pull/11911) | Bugfix: scrambled columns                                 |
+| 0.1.8   | 2022-02-04 | [9792](https://github.com/airbytehq/airbyte/pull/9792)   | Added oauth support                                       |
diff --git a/docs/integrations/sources/snowflake.md b/docs/integrations/sources/snowflake.md
index 0c9a15e483baf0..f500081c8b2a63 100644
--- a/docs/integrations/sources/snowflake.md
+++ b/docs/integrations/sources/snowflake.md
@@ -72,10 +72,38 @@ You can limit this grant down to specific schemas instead of the whole database.
 
 Your database user should now be ready for use with Airbyte.
 
+###Authentication
+#### There are 2 way ways of oauth supported: login\pass and oauth2.
+
+### Login and Password
+| Field | Description                                                                                                                                                                                       |
+|---|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| [Host](https://docs.snowflake.com/en/user-guide/admin-account-identifier.html) | The host domain of the snowflake instance (must include the account, region, cloud environment, and end with snowflakecomputing.com). Example: `accountname.us-east-2.aws.snowflakecomputing.com` |
+| [Role](https://docs.snowflake.com/en/user-guide/security-access-control-overview.html#roles) | The role you created in Step 1 for Airbyte to access Snowflake. Example: `AIRBYTE_ROLE`                                                                                                           |
+| [Warehouse](https://docs.snowflake.com/en/user-guide/warehouses-overview.html#overview-of-warehouses) | The warehouse you created in Step 1 for Airbyte to sync data into. Example: `AIRBYTE_WAREHOUSE`                                                                                                   |
+| [Database](https://docs.snowflake.com/en/sql-reference/ddl-database.html#database-schema-share-ddl) | The database you created in Step 1 for Airbyte to sync data into. Example: `AIRBYTE_DATABASE`                                                                                                     |
+| [Schema](https://docs.snowflake.com/en/sql-reference/ddl-database.html#database-schema-share-ddl) | The default schema used as the target schema for all statements issued from the connection that do not explicitly specify a schema name.                                                          |
+| Username | The username you created in Step 2 to allow Airbyte to access the database. Example: `AIRBYTE_USER`                                                                                               |
+| Password | The password associated with the username.                                                                                                                                                        |
+| [JDBC URL Params](https://docs.snowflake.com/en/user-guide/jdbc-parameters.html) (Optional) | Additional properties to pass to the JDBC URL string when connecting to the database formatted as `key=value` pairs separated by the symbol `&`. Example: `key1=value1&key2=value2&key3=value3`   |
+
+
+### OAuth 2.0
+Field | Description |
+|---|---|
+| [Host](https://docs.snowflake.com/en/user-guide/admin-account-identifier.html) | The host domain of the snowflake instance (must include the account, region, cloud environment, and end with snowflakecomputing.com). Example: `accountname.us-east-2.aws.snowflakecomputing.com` |
+| [Role](https://docs.snowflake.com/en/user-guide/security-access-control-overview.html#roles) | The role you created in Step 1 for Airbyte to access Snowflake. Example: `AIRBYTE_ROLE` |
+| [Warehouse](https://docs.snowflake.com/en/user-guide/warehouses-overview.html#overview-of-warehouses) | The warehouse you created in Step 1 for Airbyte to sync data into. Example: `AIRBYTE_WAREHOUSE` |
+| [Database](https://docs.snowflake.com/en/sql-reference/ddl-database.html#database-schema-share-ddl) | The database you created in Step 1 for Airbyte to sync data into. Example: `AIRBYTE_DATABASE` |
+| [Schema](https://docs.snowflake.com/en/sql-reference/ddl-database.html#database-schema-share-ddl) | The default schema used as the target schema for all statements issued from the connection that do not explicitly specify a schema name.  |
+| OAuth2 | The Login name and password to obtain auth token. |
+| [JDBC URL Params](https://docs.snowflake.com/en/user-guide/jdbc-parameters.html) (Optional) | Additional properties to pass to the JDBC URL string when connecting to the database formatted as `key=value` pairs separated by the symbol `&`. Example: `key1=value1&key2=value2&key3=value3` |
+
 ## Changelog
 
 | Version | Date | Pull Request | Subject |
 | :--- | :--- | :--- | :--- |
+| 0.1.11 | 2022-04-27 | [10953](https://github.com/airbytehq/airbyte/pull/10953) | Implement OAuth flow |
 | 0.1.9 | 2022-02-21 | [10242](https://github.com/airbytehq/airbyte/pull/10242) | Fixed cursor for old connectors that use non-microsecond format. Now connectors work with both formats |
 | 0.1.8 | 2022-02-18 | [10242](https://github.com/airbytehq/airbyte/pull/10242) | Updated timestamp transformation with microseconds |
 | 0.1.7 | 2022-02-14 | [10256](https://github.com/airbytehq/airbyte/pull/10256) | Add `-XX:+ExitOnOutOfMemoryError` JVM option |
diff --git a/docs/integrations/sources/tiktok-marketing.md b/docs/integrations/sources/tiktok-marketing.md
index 0642ece8c5a44f..9ae8455bfcad27 100644
--- a/docs/integrations/sources/tiktok-marketing.md
+++ b/docs/integrations/sources/tiktok-marketing.md
@@ -1,64 +1,527 @@
 # TikTok Marketing
 
-## Overview
+This page guides you through the process of setting up the TikTok Marketing source connector.
 
-The [TikTok For Business Marketing API](https://ads.tiktok.com/marketing_api/homepage?rid=uvtbok1h19) allows you to directly interact with the TikTok Ads Manager platform for automated ad management and analysis. 
+## Prerequisites
 
-The TikTok Marketing source supports both Full Refresh and Incremental syncs. You can choose if this connector will copy only the new or updated data, or all rows in the tables and columns you set up for replication, every time a sync is run.
+For Production environment:
+* Access token 
+* Secret
+* App ID
 
-This Source Connector is based on a [Airbyte CDK](https://docs.airbyte.io/connector-development/cdk-python).
+For Sandbox environment:
+* Access token 
+* Advertiser ID
 
-### Streams information
+* Start date
+* Report Granularity (LIFETIME, DAY, HOUR)
 
-| Stream                            | Environment  | Granularities     | Key         | Incremental    | Schema                                                                                        |
-|:----------------------------------|--------------|-------------------|-------------|:---------------|-----------------------------------------------------------------------------------------------|
-| Advertisers                       | Prod,Sandbox | LIFETIME,DAY,HOUR | id          | No             | [Link](https://business-api.tiktok.com/marketing_api/docs?id=1708503202263042)                |
-| AdGroups                          | Prod,Sandbox | LIFETIME,DAY,HOUR | adgroup_id  | Yes (DAY,HOUR) | [Link](https://business-api.tiktok.com/marketing_api/docs?id=1708503489590273)                |
-| Ads                               | Prod,Sandbox | LIFETIME,DAY,HOUR | ad_id       | Yes (DAY,HOUR) | [Link](https://business-api.tiktok.com/marketing_api/docs?id=1708572923161602)                |
-| Campaigns                         | Prod,Sandbox | LIFETIME,DAY,HOUR | campaign_id | Yes (DAY,HOUR) | [Link](https://business-api.tiktok.com/marketing_api/docs?id=1708582970809346)                |
-| AdsReports                        | Prod,Sandbox | LIFETIME,DAY,HOUR | None        | Yes (DAY,HOUR) | [BasicReportsLink](https://business-api.tiktok.com/marketing_api/docs?id=1707957200780290)    |
-| AdvertisersReports                | Prod         | LIFETIME,DAY,HOUR | None        | Yes (DAY,HOUR) | [BasicReportsLink](https://business-api.tiktok.com/marketing_api/docs?id=1707957200780290)    |
-| AdGroupsReports                   | Prod,Sandbox | LIFETIME,DAY,HOUR | None        | Yes (DAY,HOUR) | [BasicReportsLink](https://business-api.tiktok.com/marketing_api/docs?id=1707957200780290)    |
-| CampaignsReports                  | Prod,Sandbox | LIFETIME,DAY,HOUR | None        | Yes (DAY,HOUR) | [BasicReportsLink](https://business-api.tiktok.com/marketing_api/docs?id=1707957200780290)    |
-| AdvertisersAudienceReports        | Prod         | LIFETIME,DAY,HOUR | None        | Yes (DAY,HOUR) | [AudienceReportsLink](https://business-api.tiktok.com/marketing_api/docs?id=1707957217727489) |
-| AdGroupAudienceReports            | Prod,Sandbox | DAY,HOUR          | None        | Yes (DAY,HOUR) | [AudienceReportsLink](https://business-api.tiktok.com/marketing_api/docs?id=1707957217727489) |
-| AdsAudienceReports                | Prod,Sandbox | DAY,HOUR          | None        | Yes (DAY,HOUR) | [AudienceReportsLink](https://business-api.tiktok.com/marketing_api/docs?id=1707957217727489) |
-| CampaignsAudienceReportsByCountry | Prod,Sandbox | DAY,HOUR          | None        | Yes (DAY,HOUR) | [AudienceReportsLink](https://business-api.tiktok.com/marketing_api/docs?id=1707957217727489) |
+## Step 1: Set up TikTok
 
-If there are more endpoints you'd like Airbyte to support, please [create an issue.](https://github.com/airbytehq/airbyte/issues/new/choose)
+1. Create a TikTok For Business account: [Link](https://ads.tiktok.com/marketing_api/docs?rid=fgvgaumno25&id=1702715936951297)
+2. Create developer application: [Link](https://ads.tiktok.com/marketing_api/docs?rid=fgvgaumno25&id=1702716474845185)
+3. For sandbox environment: create a Sandbox Ad Account [Link](https://ads.tiktok.com/marketing_api/docs?rid=fgvgaumno25&id=1701890920013825)
 
-### Features
+## Step 2: Set up the source connector in Airbyte
 
-| Feature | Supported? |
-| :--- | :--- |
-| Full Refresh Sync | Yes |
-| Incremental - Append Sync | Yes |
-| SSL connection | Yes |
-| Namespaces | No |
+**For Airbyte Cloud:**
 
-### Performance considerations
+1. [Log into your Airbyte Cloud](https://cloud.airbyte.io/workspaces) account.
+2. In the left navigation bar, click **Sources**. In the top-right corner, click **+ new source**.
+3. On the source setup page, select **Tiktok Marketing** from the Source type dropdown and enter a name for this connector.
+4. Select `OAuth2.0` Authorization method, then click `Authenticate your account`.
+5. Log in and Authorize to the Tiktok account
+6. Choose required Start date and report granularity
+7. click `Set up source`.
 
-The connector is restricted by [requests limitation](https://ads.tiktok.com/marketing_api/docs?rid=fgvgaumno25&id=1701890997610497). This connector should not run into TikTok Marketing API limitations under normal usage. Please [create an issue](https://github.com/airbytehq/airbyte/issues) if you see any rate limit issues that are not automatically retried successfully.
+**For Airbyte OSS:**
 
-## Getting started
+1. Go to local Airbyte page.
+2. In the left navigation bar, click **Sources**. In the top-right corner, click **+ new source**. 
+3. On the Set up the source page, enter the name for the connector and select **Tiktok Marketing** from the Source type dropdown. 
+4. Select `Production Access Token` or `Sandbox Access Token` Authorization method, then copy and paste info from step 1.
+5. Choose required Start date and report granularity
+6. Click `Set up source`.
 
-### Requirements
+## Supported streams and sync modes
 
-* Access Token - This token will not expire. 
-* Production Environment
-  * App ID
-  * Secret
-* SandBox Environment
-  * Advertiser ID - It is generated for sandbox in one copy
+| Stream                            | Environment  | Granularities     | Key         | Incremental    |
+|:----------------------------------|--------------|-------------------|-------------|:---------------|
+| Advertisers                       | Prod,Sandbox | LIFETIME,DAY,HOUR | id          | No             |
+| AdGroups                          | Prod,Sandbox | LIFETIME,DAY,HOUR | adgroup_id  | Yes (DAY,HOUR) |
+| Ads                               | Prod,Sandbox | LIFETIME,DAY,HOUR | ad_id       | Yes (DAY,HOUR) |
+| Campaigns                         | Prod,Sandbox | LIFETIME,DAY,HOUR | campaign_id | Yes (DAY,HOUR) |
+| AdsReports                        | Prod,Sandbox | LIFETIME,DAY,HOUR | None        | Yes (DAY,HOUR) |
+| AdvertisersReports                | Prod         | LIFETIME,DAY,HOUR | None        | Yes (DAY,HOUR) |
+| AdGroupsReports                   | Prod,Sandbox | LIFETIME,DAY,HOUR | None        | Yes (DAY,HOUR) |
+| CampaignsReports                  | Prod,Sandbox | LIFETIME,DAY,HOUR | None        | Yes (DAY,HOUR) |
+| AdvertisersAudienceReports        | Prod         | LIFETIME,DAY,HOUR | None        | Yes (DAY,HOUR) |
+| AdGroupAudienceReports            | Prod,Sandbox | DAY,HOUR          | None        | Yes (DAY,HOUR) |
+| AdsAudienceReports                | Prod,Sandbox | DAY,HOUR          | None        | Yes (DAY,HOUR) |
+| CampaignsAudienceReportsByCountry | Prod,Sandbox | DAY,HOUR          | None        | Yes (DAY,HOUR) |
 
-### Setup guide
+**[Advertisers](https://ads.tiktok.com/marketing_api/docs?id=1708503202263042) Stream**
+```
+{
+  "contacter": "Ai***te",
+  "phonenumber": "+13*****5753",
+  "license_no": "",
+  "promotion_center_city": null,
+  "balance": 10,
+  "license_url": null,
+  "timezone": "Etc/GMT+8",
+  "reason": "",
+  "telephone": "+14*****6785",
+  "id": 7002238017842757633,
+  "language": "en",
+  "country": "US",
+  "role": "ROLE_ADVERTISER",
+  "license_province": null,
+  "display_timezone": "America/Los_Angeles",
+  "email": "i***************@**********",
+  "license_city": null,
+  "industry": "291905",
+  "create_time": 1630335591,
+  "promotion_center_province": null,
+  "address": "350 29th avenue, San Francisco",
+  "currency": "USD",
+  "promotion_area": "0",
+  "status": "STATUS_ENABLE",
+  "description": "https://",
+  "brand": null,
+  "name": "Airbyte0830",
+  "company": "Airbyte"
+}
+```
 
-Please read [How to get your AppID, Secret and Access Token](https://ads.tiktok.com/marketing_api/docs?rid=fgvgaumno25&id=1701890909484033) or [How to create a SandBox Environment](https://ads.tiktok.com/marketing_api/docs?rid=fgvgaumno25&id=1701890920013825)
+**[AdGroups](https://ads.tiktok.com/marketing_api/docs?id=1708503489590273) Stream**
+```
+{
+  "placement_type": "PLACEMENT_TYPE_AUTOMATIC",
+  "budget": 20,
+  "budget_mode": "BUDGET_MODE_DAY",
+  "display_mode": null,
+  "schedule_infos": null,
+  "billing_event": "CPC",
+  "conversion_window": null,
+  "adgroup_name": "Ad Group20211020010107",
+  "interest_keywords": [],
+  "is_comment_disable": 0,
+  "rf_buy_type": null,
+  "frequency": null,
+  "bid_type": "BID_TYPE_NO_BID",
+  "placement": null,
+  "bid": 0,
+  "include_custom_actions": [],
+  "operation_system": [],
+  "pixel_id": null,
+  "dayparting": "111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111",
+  "app_type": null,
+  "conversion_id": 0,
+  "rf_predict_cpr": null,
+  "deep_bid_type": null,
+  "scheduled_budget": 0.0,
+  "adgroup_id": 1714125049901106,
+  "frequency_schedule": null,
+  "exclude_custom_actions": [],
+  "advertiser_id": 7002238017842757633,
+  "deep_cpabid": 0,
+  "is_new_structure": true,
+  "buy_impression": null,
+  "external_type": "WEBSITE",
+  "excluded_audience": [],
+  "deep_external_action": null,
+  "interest_category_v2": [],
+  "rf_predict_frequency": null,
+  "audience": [],
+  "pacing": "PACING_MODE_SMOOTH",
+  "brand_safety_partner": null,
+  "daily_retention_ratio": null,
+  "optimize_goal": "CLICK",
+  "enable_search_result": false,
+  "conversion_bid": 0,
+  "schedule_end_time": "2021-10-31 09:01:07",
+  "opt_status": "ENABLE",
+  "status": "ADGROUP_STATUS_CAMPAIGN_DISABLE",
+  "app_id": null,
+  "external_action": null,
+  "schedule_type": "SCHEDULE_START_END",
+  "brand_safety": "NO_BRAND_SAFETY",
+  "campaign_id": 1714125042508817,
+  "campaign_name": "Website Traffic20211020010104",
+  "split_test_adgroup_ids": [],
+  "action_v2": [],
+  "is_hfss": false,
+  "keywords": null,
+  "create_time": "2021-10-20 08:04:05",
+  "feed_type": null,
+  "languages": ["en"],
+  "enable_inventory_filter": false,
+  "device_price": [],
+  "location": [6252001],
+  "schedule_start_time": "2021-10-20 09:01:07",
+  "skip_learning_phase": 0,
+  "gender": "GENDER_UNLIMITED",
+  "creative_material_mode": "CUSTOM",
+  "app_download_url": null,
+  "device_models": [],
+  "automated_targeting": "OFF",
+  "connection_type": [],
+  "ios14_quota_type": "UNOCCUPIED",
+  "modify_time": "2022-03-24 12:06:54",
+  "category": 0,
+  "statistic_type": null,
+  "video_download": "ALLOW_DOWNLOAD",
+  "age": ["AGE_25_34", "AGE_35_44", "AGE_45_54"],
+  "buy_reach": null,
+  "is_share_disable": false
+}
+```
+
+**[Ads](https://ads.tiktok.com/marketing_api/docs?id=1708572923161602) Stream**
+```
+{
+  "vast_moat": false,
+  "is_new_structure": true,
+  "campaign_name": "CampaignVadimTraffic",
+  "landing_page_urls": null,
+  "card_id": null,
+  "adgroup_id": 1728545385226289,
+  "campaign_id": 1728545382536225,
+  "status": "AD_STATUS_CAMPAIGN_DISABLE",
+  "brand_safety_postbid_partner": "UNSET",
+  "advertiser_id": 7002238017842757633,
+  "is_aco": false,
+  "ad_text": "Open-source\ndata integration for modern data teams",
+  "identity_id": "7080121820963422209",
+  "display_name": "airbyte",
+  "open_url": "",
+  "external_action": null,
+  "playable_url": "",
+  "create_time": "2022-03-28 12:09:09",
+  "product_ids": [],
+  "adgroup_name": "AdGroupVadim",
+  "fallback_type": "UNSET",
+  "creative_type": null,
+  "ad_name": "AdVadim-Optimized Version 3_202203281449_2022-03-28 05:03:44",
+  "video_id": "v10033g50000c90q1d3c77ub6e96fvo0",
+  "ad_format": "SINGLE_VIDEO",
+  "profile_image": "https://p21-ad-sg.ibyteimg.com/large/ad-site-i18n-sg/202203285d0de5c114d0690a462bb6a4",
+  "open_url_type": "NORMAL",
+  "click_tracking_url": null,
+  "page_id": null,
+  "ad_texts": null,
+  "landing_page_url": "https://airbyte.com",
+  "identity_type": "CUSTOMIZED_USER",
+  "avatar_icon_web_uri": "ad-site-i18n-sg/202203285d0de5c114d0690a462bb6a4",
+  "app_name": "",
+  "modify_time": "2022-03-28 21:34:26",
+  "opt_status": "ENABLE",
+  "call_to_action_id": "7080120957230238722",
+  "image_ids": ["v0201/7f371ff6f0764f8b8ef4f37d7b980d50"],
+  "ad_id": 1728545390695442,
+  "impression_tracking_url": null,
+  "is_creative_authorized": false
+}
+```
+
+**[Campaigns](https://ads.tiktok.com/marketing_api/docs?id=1708582970809346) Stream**
+```
+{
+  "create_time": "2021-10-19 18:18:08",
+  "campaign_id": 1714073078669329,
+  "roas_bid": 0.0,
+  "advertiser_id": 7002238017842757633,
+  "modify_time": "2022-03-28 12:01:56",
+  "campaign_type": "REGULAR_CAMPAIGN",
+  "status": "CAMPAIGN_STATUS_DISABLE",
+  "objective_type": "TRAFFIC",
+  "split_test_variable": null,
+  "opt_status": "DISABLE",
+  "budget": 50,
+  "is_new_structure": true,
+  "deep_bid_type": null,
+  "campaign_name": "Website Traffic20211019110444",
+  "budget_mode": "BUDGET_MODE_DAY",
+  "objective": "LANDING_PAGE"
+}
+```
+
+**AdsReports Stream - [BasicReports](https://ads.tiktok.com/marketing_api/docs?id=1707957200780290)**
+```
+{
+  "dimensions": {
+    "ad_id": 1728545390695442,
+    "stat_time_day": "2022-03-29 00:00:00"
+  },
+  "metrics": {
+    "real_time_result_rate": 0.93,
+    "campaign_id": 1728545382536225,
+    "placement": "Automatic Placement",
+    "frequency": 1.17,
+    "cpc": 0.35,
+    "ctr": 0.93,
+    "cost_per_result": 0.3509,
+    "impressions": 6137,
+    "cost_per_conversion": 0,
+    "real_time_result": 57,
+    "adgroup_id": 1728545385226289,
+    "result_rate": 0.93,
+    "cost_per_1000_reached": 3.801,
+    "ad_text": "Open-source\ndata integration for modern data teams",
+    "spend": 20,
+    "conversion_rate": 0,
+    "real_time_cost_per_conversion": 0,
+    "promotion_type": "Website",
+    "tt_app_id": 0,
+    "real_time_cost_per_result": 0.3509,
+    "conversion": 0,
+    "secondary_goal_result": null,
+    "campaign_name": "CampaignVadimTraffic",
+    "cpm": 3.26,
+    "result": 57,
+    "ad_name": "AdVadim-Optimized Version 3_202203281449_2022-03-28 05:03:44",
+    "secondary_goal_result_rate": null,
+    "clicks": 57,
+    "reach": 5262,
+    "cost_per_secondary_goal_result": null,
+    "real_time_conversion": 0,
+    "real_time_conversion_rate": 0,
+    "mobile_app_id": "0",
+    "tt_app_name": "0",
+    "adgroup_name": "AdGroupVadim",
+    "dpa_target_audience_type": null
+  }
+}
+```
+
+**AdvertisersReports Stream - [BasicReports](https://ads.tiktok.com/marketing_api/docs?id=1707957200780290)**
+```
+{
+  "metrics": {
+    "cpm": 5.43,
+    "impressions": 3682,
+    "frequency": 1.17,
+    "reach": 3156,
+    "cash_spend": 20,
+    "ctr": 1.14,
+    "spend": 20,
+    "cpc": 0.48,
+    "cost_per_1000_reached": 6.337,
+    "clicks": 42,
+    "voucher_spend": 0
+  },
+  "dimensions": {
+    "stat_time_day": "2022-03-30 00:00:00",
+    "advertiser_id": 7002238017842757633
+  }
+}
+
+```
+
+**AdGroupsReports Stream - [BasicReports](https://ads.tiktok.com/marketing_api/docs?id=1707957200780290)**
+```
+{
+  "metrics": {
+    "real_time_conversion": 0,
+    "real_time_cost_per_conversion": 0,
+    "cost_per_1000_reached": 3.801,
+    "mobile_app_id": "0",
+    "reach": 5262,
+    "cpm": 3.26,
+    "conversion": 0,
+    "promotion_type": "Website",
+    "clicks": 57,
+    "real_time_result_rate": 0.93,
+    "real_time_conversion_rate": 0,
+    "cost_per_conversion": 0,
+    "dpa_target_audience_type": null,
+    "result": 57,
+    "cpc": 0.35,
+    "impressions": 6137,
+    "cost_per_result": 0.3509,
+    "tt_app_id": 0,
+    "cost_per_secondary_goal_result": null,
+    "frequency": 1.17,
+    "spend": 20,
+    "secondary_goal_result_rate": null,
+    "real_time_cost_per_result": 0.3509,
+    "real_time_result": 57,
+    "placement": "Automatic Placement",
+    "result_rate": 0.93,
+    "tt_app_name": "0",
+    "campaign_name": "CampaignVadimTraffic",
+    "secondary_goal_result": null,
+    "campaign_id": 1728545382536225,
+    "conversion_rate": 0,
+    "ctr": 0.93,
+    "adgroup_name": "AdGroupVadim"
+  },
+  "dimensions": {
+    "adgroup_id": 1728545385226289,
+    "stat_time_day": "2022-03-29 00:00:00"
+  }
+}
+```
+
+**CampaignsReports Stream - [BasicReports](https://ads.tiktok.com/marketing_api/docs?id=1707957200780290)**
+```
+{
+  "metrics": {
+    "cpc": 0.43,
+    "spend": 20,
+    "clicks": 46,
+    "cost_per_1000_reached": 4.002,
+    "impressions": 5870,
+    "ctr": 0.78,
+    "frequency": 1.17,
+    "cpm": 3.41,
+    "campaign_name": "CampaignVadimTraffic",
+    "reach": 4997
+  },
+  "dimensions": {
+    "campaign_id": 1728545382536225,
+    "stat_time_day": "2022-03-28 00:00:00"
+  }
+}
+
+```
+
+**AdsAudienceReports Stream - [AudienceReports](https://ads.tiktok.com/marketing_api/docs?id=1707957217727489)**
+```
+{ 
+  {
+    "result": 17,
+    "clicks": 17,
+    "real_time_conversion_rate": 0,
+    "adgroup_id": 1728545385226289,
+    "cpm": 3.01,
+    "cost_per_result": 0.4165,
+    "real_time_cost_per_result": 0.4165,
+    "mobile_app_id": 0,
+    "spend": 7.08,
+    "cpc": 0.42,
+    "placement": "Automatic Placement",
+    "real_time_conversion": 0,
+    "dpa_target_audience_type": null,
+    "real_time_result_rate": 0.72,
+    "adgroup_name": "AdGroupVadim",
+    "tt_app_id": 0,
+    "ctr": 0.72,
+    "ad_text": "Open-source\ndata integration for modern data teams",
+    "result_rate": 0.72,
+    "ad_name": "AdVadim-Optimized Version 3_202203281449_2022-03-28 05:03:44",
+    "conversion_rate": 0,
+    "real_time_result": 17,
+    "tt_app_name": "0",
+    "cost_per_conversion": 0,
+    "real_time_cost_per_conversion": 0,
+    "conversion": 0,
+    "impressions": 2350,
+    "promotion_type": "Website",
+    "campaign_id": 1728545382536225,
+    "campaign_name": "CampaignVadimTraffic"
+  },
+  "dimensions": {
+    "gender": "MALE",
+    "age": "AGE_25_34",
+    "ad_id": 1728545390695442,
+    "stat_time_day": "2022-03-28 00:00:00"
+  }
+}
+```
+
+**AdvertisersAudienceReports Stream - [AudienceReports](https://ads.tiktok.com/marketing_api/docs?id=1707957217727489)**
+```
+{
+  "dimensions": {
+    "stat_time_day": "2022-03-28 00:00:00",
+    "gender": "FEMALE",
+    "advertiser_id": 7002238017842757633,
+    "age": "AGE_35_44"
+  },
+  "metrics": {
+    "spend": 3.09,
+    "ctr": 0.93,
+    "cpc": 0.44,
+    "clicks": 7,
+    "cpm": 4.11,
+    "impressions": 752
+  }
+}
+```
+
+**AdGroupAudienceReports Stream - [AudienceReports](https://ads.tiktok.com/marketing_api/docs?id=1707957217727489)**
+```
+{
+  "dimensions": {
+    "gender": "MALE",
+    "age": "AGE_25_34",
+    "stat_time_day": "2022-03-29 00:00:00",
+    "adgroup_id": 1728545385226289
+  },
+  "metrics": {
+    "cost_per_conversion": 0,
+    "campaign_id": 1728545382536225,
+    "campaign_name": "CampaignVadimTraffic",
+    "clicks": 20,
+    "dpa_target_audience_type": null,
+    "mobile_app_id": 0,
+    "promotion_type": "Website",
+    "conversion_rate": 0,
+    "cpm": 3.9,
+    "cost_per_result": 0.3525,
+    "cpc": 0.35,
+    "real_time_cost_per_conversion": 0,
+    "ctr": 1.11,
+    "spend": 7.05,
+    "result": 20,
+    "real_time_result": 20,
+    "impressions": 1806,
+    "conversion": 0,
+    "real_time_result_rate": 1.11,
+    "real_time_conversion_rate": 0,
+    "real_time_conversion": 0,
+    "adgroup_name": "AdGroupVadim",
+    "tt_app_name": "0",
+    "placement": "Automatic Placement",
+    "real_time_cost_per_result": 0.3525,
+    "result_rate": 1.11,
+    "tt_app_id": 0
+  }
+}
+```
+
+**CampaignsAudienceReportsByCountry Stream - [AudienceReports](https://ads.tiktok.com/marketing_api/docs?id=1707957217727489)**
+```
+{
+  "metrics": {
+    "impressions": 5870,
+    "campaign_name": "CampaignVadimTraffic",
+    "cpm": 3.41,
+    "clicks": 46,
+    "spend": 20,
+    "ctr": 0.78,
+    "cpc": 0.43
+  },
+  "dimensions": {
+    "stat_time_day": "2022-03-28 00:00:00",
+    "campaign_id": 1728545382536225,
+    "country_code": "US"
+  }
+}
+
+```
+
+## Performance considerations
+
+The connector is restricted by [requests limitation](https://ads.tiktok.com/marketing_api/docs?rid=fgvgaumno25&id=1725359439428610). This connector should not run into TikTok Marketing API limitations under normal usage. Please [create an issue](https://github.com/airbytehq/airbyte/issues) if you see any rate limit issues that are not automatically retried successfully.
 
 ## Changelog
 
 | Version | Date       | Pull Request                                             | Subject                                                                                       |
 |:--------|:-----------|:---------------------------------------------------------|:----------------------------------------------------------------------------------------------|
+| 0.1.7   | 2022-04-27 | [12380](https://github.com/airbytehq/airbyte/pull/12380) | fixed spec descriptions and documentation                                                     |
 | 0.1.6   | 2022-04-19 | [11378](https://github.com/airbytehq/airbyte/pull/11378) | updated logic for stream initializations, fixed errors in schemas, updated SAT and unit tests |
 | 0.1.5   | 2022-02-17 | [10398](https://github.com/airbytehq/airbyte/pull/10398) | Add Audience reports                                                                          |
 | 0.1.4   | 2021-12-30 | [7636](https://github.com/airbytehq/airbyte/pull/7636)   | Add OAuth support                                                                             |
diff --git a/docs/integrations/sources/zendesk-support.md b/docs/integrations/sources/zendesk-support.md
index 1376d6c0d07fef..ac4aff49d8c2f1 100644
--- a/docs/integrations/sources/zendesk-support.md
+++ b/docs/integrations/sources/zendesk-support.md
@@ -72,24 +72,25 @@ The Zendesk connector should not run into Zendesk API limitations under normal u
 
 ### CHANGELOG
 
-| Version  | Date       | Pull Request | Subject                                                |
-|:---------|:-----------| :-----       |:-------------------------------------------------------|
+| Version  | Date       | Pull Request                                             | Subject                                                                 |
+|:---------|:-----------|:---------------------------------------------------------|:------------------------------------------------------------------------|
+| `0.2.7`  | 2022-04-27 | [12335](https://github.com/airbytehq/airbyte/pull/12335) | Adding fixtures to mock time.sleep for connectors that explicitly sleep |
 | `0.2.6`  | 2022-04-19 | [12122](https://github.com/airbytehq/airbyte/pull/12122) | Fixed the bug when only 100,000 Users are synced [11895](https://github.com/airbytehq/airbyte/issues/11895) and fixed bug when `start_date` is not used on user stream [12059](https://github.com/airbytehq/airbyte/issues/12059).
-| `0.2.5`  | 2022-04-05 | [11727](https://github.com/airbytehq/airbyte/pull/11727) | Fixed the bug when state was not parsed correctly
-| `0.2.4`  | 2022-04-04 | [11688](https://github.com/airbytehq/airbyte/pull/11688) | Small documentation corrections
-| `0.2.3`  | 2022-03-23 | [11349](https://github.com/airbytehq/airbyte/pull/11349) | Fixed the bug when Tickets stream didn't return deleted records
-| `0.2.2`  | 2022-03-17 | [11237](https://github.com/airbytehq/airbyte/pull/11237) | Fixed the bug when TicketComments stream didn't return all records
-| `0.2.1`  | 2022-03-15 | [11162](https://github.com/airbytehq/airbyte/pull/11162) | Added support of OAuth2.0 authentication method
-| `0.2.0`  | 2022-03-01 | [9456](https://github.com/airbytehq/airbyte/pull/9456) | Update source to use future requests                   |
-| `0.1.12` | 2022-01-25 | [9785](https://github.com/airbytehq/airbyte/pull/9785) | Add additional log messages                            |
-| `0.1.11` | 2021-12-21 | [8987](https://github.com/airbytehq/airbyte/pull/8987) | Update connector fields title/description              |
-| `0.1.9`  | 2021-12-16 | [8616](https://github.com/airbytehq/airbyte/pull/8616) | Adds Brands, CustomRoles and Schedules streams         |
-| `0.1.8`  | 2021-11-23 | [8050](https://github.com/airbytehq/airbyte/pull/8168) | Adds TicketMetricEvents stream                         |
-| `0.1.7`  | 2021-11-23 | [8058](https://github.com/airbytehq/airbyte/pull/8058) | Added support of AccessToken authentication            |
-| `0.1.6`  | 2021-11-18 | [8050](https://github.com/airbytehq/airbyte/pull/8050) | Fix wrong types for schemas, add TypeTransformer       |
-| `0.1.5`  | 2021-10-26 | [7679](https://github.com/airbytehq/airbyte/pull/7679) | Add ticket_id and ticket_comments                      |
-| `0.1.4`  | 2021-10-26 | [7377](https://github.com/airbytehq/airbyte/pull/7377) | Fix initially_assigned_at type in ticket metrics       |
-| `0.1.3`  | 2021-10-17 | [7097](https://github.com/airbytehq/airbyte/pull/7097) | Corrected the connector's specification                |
-| `0.1.2`  | 2021-10-16 | [6513](https://github.com/airbytehq/airbyte/pull/6513) | Fixed TicketComments stream                            |
-| `0.1.1`  | 2021-09-02 | [5787](https://github.com/airbytehq/airbyte/pull/5787) | Fixed incremental logic for the ticket_comments stream |
-| `0.1.0`  | 2021-07-21 | [4861](https://github.com/airbytehq/airbyte/pull/4861) | Created CDK native zendesk connector                   |
+| `0.2.5`  | 2022-04-05 | [11727](https://github.com/airbytehq/airbyte/pull/11727) | Fixed the bug when state was not parsed correctly                       |
+| `0.2.4`  | 2022-04-04 | [11688](https://github.com/airbytehq/airbyte/pull/11688) | Small documentation corrections                                         |
+| `0.2.3`  | 2022-03-23 | [11349](https://github.com/airbytehq/airbyte/pull/11349) | Fixed the bug when Tickets stream didn't return deleted records         |
+| `0.2.2`  | 2022-03-17 | [11237](https://github.com/airbytehq/airbyte/pull/11237) | Fixed the bug when TicketComments stream didn't return all records      |
+| `0.2.1`  | 2022-03-15 | [11162](https://github.com/airbytehq/airbyte/pull/11162) | Added support of OAuth2.0 authentication method                         |
+| `0.2.0`  | 2022-03-01 | [9456](https://github.com/airbytehq/airbyte/pull/9456) | Update source to use future requests                                      |
+| `0.1.12` | 2022-01-25 | [9785](https://github.com/airbytehq/airbyte/pull/9785) | Add additional log messages                                               |
+| `0.1.11` | 2021-12-21 | [8987](https://github.com/airbytehq/airbyte/pull/8987) | Update connector fields title/description                                 |
+| `0.1.9`  | 2021-12-16 | [8616](https://github.com/airbytehq/airbyte/pull/8616) | Adds Brands, CustomRoles and Schedules streams                            |
+| `0.1.8`  | 2021-11-23 | [8050](https://github.com/airbytehq/airbyte/pull/8168) | Adds TicketMetricEvents stream                                            |
+| `0.1.7`  | 2021-11-23 | [8058](https://github.com/airbytehq/airbyte/pull/8058) | Added support of AccessToken authentication                               |
+| `0.1.6`  | 2021-11-18 | [8050](https://github.com/airbytehq/airbyte/pull/8050) | Fix wrong types for schemas, add TypeTransformer                          |
+| `0.1.5`  | 2021-10-26 | [7679](https://github.com/airbytehq/airbyte/pull/7679) | Add ticket_id and ticket_comments                                         |
+| `0.1.4`  | 2021-10-26 | [7377](https://github.com/airbytehq/airbyte/pull/7377) | Fix initially_assigned_at type in ticket metrics                          |
+| `0.1.3`  | 2021-10-17 | [7097](https://github.com/airbytehq/airbyte/pull/7097) | Corrected the connector's specification                                   |
+| `0.1.2`  | 2021-10-16 | [6513](https://github.com/airbytehq/airbyte/pull/6513) | Fixed TicketComments stream                                               |
+| `0.1.1`  | 2021-09-02 | [5787](https://github.com/airbytehq/airbyte/pull/5787) | Fixed incremental logic for the ticket_comments stream                    |
+| `0.1.0`  | 2021-07-21 | [4861](https://github.com/airbytehq/airbyte/pull/4861) | Created CDK native zendesk connector                                      |
diff --git a/docs/operator-guides/upgrading-airbyte.md b/docs/operator-guides/upgrading-airbyte.md
index e58aa63432b017..10d152049f4af1 100644
--- a/docs/operator-guides/upgrading-airbyte.md
+++ b/docs/operator-guides/upgrading-airbyte.md
@@ -103,7 +103,7 @@ If you are upgrading from (i.e. your current version of Airbyte is) Airbyte vers
    Here's an example of what it might look like with the values filled in. It assumes that the downloaded `airbyte_archive.tar.gz` is in `/tmp`.
 
    ```bash
-   docker run --rm -v /tmp:/config airbyte/migration:0.36.3-alpha --\
+   docker run --rm -v /tmp:/config airbyte/migration:0.36.5-alpha --\
    --input /config/airbyte_archive.tar.gz\
    --output /config/airbyte_archive_migrated.tar.gz
    ```
diff --git a/kube/overlays/stable-with-resource-limits/.env b/kube/overlays/stable-with-resource-limits/.env
index 75b1cfdbfa75e8..f648fced94bb1d 100644
--- a/kube/overlays/stable-with-resource-limits/.env
+++ b/kube/overlays/stable-with-resource-limits/.env
@@ -1,4 +1,4 @@
-AIRBYTE_VERSION=0.36.3-alpha
+AIRBYTE_VERSION=0.36.5-alpha
 
 # Airbyte Internal Database, see https://docs.airbyte.io/operator-guides/configuring-airbyte-db
 DATABASE_HOST=airbyte-db-svc
diff --git a/kube/overlays/stable-with-resource-limits/kustomization.yaml b/kube/overlays/stable-with-resource-limits/kustomization.yaml
index 9de37822186a32..7a0998ce279034 100644
--- a/kube/overlays/stable-with-resource-limits/kustomization.yaml
+++ b/kube/overlays/stable-with-resource-limits/kustomization.yaml
@@ -8,17 +8,17 @@ bases:
 
 images:
   - name: airbyte/db
-    newTag: 0.36.3-alpha
+    newTag: 0.36.5-alpha
   - name: airbyte/bootloader
-    newTag: 0.36.3-alpha
+    newTag: 0.36.5-alpha
   - name: airbyte/scheduler
-    newTag: 0.36.3-alpha
+    newTag: 0.36.5-alpha
   - name: airbyte/server
-    newTag: 0.36.3-alpha
+    newTag: 0.36.5-alpha
   - name: airbyte/webapp
-    newTag: 0.36.3-alpha
+    newTag: 0.36.5-alpha
   - name: airbyte/worker
-    newTag: 0.36.3-alpha
+    newTag: 0.36.5-alpha
   - name: temporalio/auto-setup
     newTag: 1.7.0
 
diff --git a/kube/overlays/stable/.env b/kube/overlays/stable/.env
index 3b82b057729cfc..2a231f777ab9b6 100644
--- a/kube/overlays/stable/.env
+++ b/kube/overlays/stable/.env
@@ -1,4 +1,4 @@
-AIRBYTE_VERSION=0.36.3-alpha
+AIRBYTE_VERSION=0.36.5-alpha
 
 # Airbyte Internal Database, see https://docs.airbyte.io/operator-guides/configuring-airbyte-db
 DATABASE_HOST=airbyte-db-svc
diff --git a/kube/overlays/stable/kustomization.yaml b/kube/overlays/stable/kustomization.yaml
index 277f73114c8f5a..a59991df33dea2 100644
--- a/kube/overlays/stable/kustomization.yaml
+++ b/kube/overlays/stable/kustomization.yaml
@@ -8,17 +8,17 @@ bases:
 
 images:
   - name: airbyte/db
-    newTag: 0.36.3-alpha
+    newTag: 0.36.5-alpha
   - name: airbyte/bootloader
-    newTag: 0.36.3-alpha
+    newTag: 0.36.5-alpha
   - name: airbyte/scheduler
-    newTag: 0.36.3-alpha
+    newTag: 0.36.5-alpha
   - name: airbyte/server
-    newTag: 0.36.3-alpha
+    newTag: 0.36.5-alpha
   - name: airbyte/webapp
-    newTag: 0.36.3-alpha
+    newTag: 0.36.5-alpha
   - name: airbyte/worker
-    newTag: 0.36.3-alpha
+    newTag: 0.36.5-alpha
   - name: temporalio/auto-setup
     newTag: 1.7.0
 
diff --git a/octavia-cli/Dockerfile b/octavia-cli/Dockerfile
index 0172db4bf5b4f1..291e9dbd7da3f1 100644
--- a/octavia-cli/Dockerfile
+++ b/octavia-cli/Dockerfile
@@ -14,5 +14,5 @@ USER octavia-cli
 WORKDIR /home/octavia-project
 ENTRYPOINT ["octavia"]
 
-LABEL io.airbyte.version=0.36.3-alpha
+LABEL io.airbyte.version=0.36.5-alpha
 LABEL io.airbyte.name=airbyte/octavia-cli
diff --git a/octavia-cli/README.md b/octavia-cli/README.md
index f1da22e32d3c48..2de64af914cc02 100644
--- a/octavia-cli/README.md
+++ b/octavia-cli/README.md
@@ -105,7 +105,7 @@ This script:
 ```bash
 touch ~/.octavia # Create a file to store env variables that will be mapped the octavia-cli container
 mkdir my_octavia_project_directory # Create your octavia project directory where YAML configurations will be stored.
-docker run --name octavia-cli -i --rm -v my_octavia_project_directory:/home/octavia-project --network host --user $(id -u):$(id -g) --env-file ~/.octavia airbyte/octavia-cli:0.36.3-alpha
+docker run --name octavia-cli -i --rm -v my_octavia_project_directory:/home/octavia-project --network host --user $(id -u):$(id -g) --env-file ~/.octavia airbyte/octavia-cli:0.36.5-alpha
 ```
 
 ### Using `docker-compose`
diff --git a/octavia-cli/install.sh b/octavia-cli/install.sh
index 4d6e1d2d16598a..032a375959f2b4 100755
--- a/octavia-cli/install.sh
+++ b/octavia-cli/install.sh
@@ -3,7 +3,7 @@
 # This install scripts currently only works for ZSH and Bash profiles.
 # It creates an octavia alias in your profile bound to a docker run command and your current user.
 
-VERSION=0.36.3-alpha
+VERSION=0.36.5-alpha
 OCTAVIA_ENV_FILE=${HOME}/.octavia
 
 detect_profile() {
diff --git a/octavia-cli/setup.py b/octavia-cli/setup.py
index 5e528cae231e8c..f50f51bb63ea1f 100644
--- a/octavia-cli/setup.py
+++ b/octavia-cli/setup.py
@@ -15,7 +15,7 @@
 
 setup(
     name="octavia-cli",
-    version="0.36.3",
+    version="0.36.5",
     description="A command line interface to manage Airbyte configurations",
     long_description=README,
     author="Airbyte",
diff --git a/tools/bin/deploy_docusaurus b/tools/bin/deploy_docusaurus
index 2f74f66cac9ce8..fb4c206b15d81a 100755
--- a/tools/bin/deploy_docusaurus
+++ b/tools/bin/deploy_docusaurus
@@ -17,6 +17,17 @@ else
   exit 1
 fi
 
+# if a string
+if $(git remote get-url origin | grep --quiet "http"); then
+  set +o xtrace
+  echo -e "$red_text""This program requires a ssh-based github repo""$default_text"
+  echo -e "$red_text""https://docs.github.com/en/authentication/connecting-to-github-with-ssh/adding-a-new-ssh-key-to-your-github-account""$default_text"
+  echo -e "$red_text""You will need to change your remote to continue.  Yell @topher for help""$default_text"
+  echo -e "$red_text""change your remote command:""$default_text"
+  echo -e "$red_text""git remote set-url origin git@github.com:airbytehq/airbyte.git""$default_text"
+  exit 1
+fi
+
 
 # ------------- Start Main
 set +o xtrace