diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index afb21e42..dc53bbb5 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -1,3 +1,3 @@
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:52b5557b7155a80e6f1684c2376d5eef0df6d8d5c785551e1ff8cc000603b62a
+  digest: sha256:d4b2141d65566523dfd523f63c6e6899ab1281463bce182a9f600e74b0511875
diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml
index 1a23ea42..2176b054 100644
--- a/.github/blunderbuss.yml
+++ b/.github/blunderbuss.yml
@@ -1,5 +1,5 @@
 # Configuration for the Blunderbuss GitHub app. For more info see
-# https://github.com/googleapis/repo-automation-bots/tree/master/packages/blunderbuss
+# https://github.com/googleapis/repo-automation-bots/tree/main/packages/blunderbuss
 assign_prs_by:
 - labels:
   - samples
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 32e0ea5a..6f09d695 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -2,7 +2,7 @@ rebaseMergeAllowed: false
 squashMergeAllowed: true
 mergeCommitAllowed: false
 branchProtectionRules:
-  - pattern: master
+  - pattern: main
     isAdminEnforced: true
     requiredApprovingReviewCount: 1
     requiresCodeOwnerReviews: true
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 3becb5c0..2425d723 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,7 +1,7 @@
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
 name: ci
 jobs:
@@ -9,14 +9,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11]
+        java: [8, 11, 17]
     steps:
     - uses: actions/checkout@v2
     - uses: stCarolas/setup-maven@v4
       with:
         maven-version: 3.8.1
-    - uses: actions/setup-java@v1
+    - uses: actions/setup-java@v2
       with:
+        distribution: zulu
         java-version: ${{matrix.java}}
     - run: java -version
     - run: .kokoro/build.sh
@@ -29,8 +30,9 @@ jobs:
     - uses: stCarolas/setup-maven@v4
       with:
         maven-version: 3.8.1
-    - uses: actions/setup-java@v1
+    - uses: actions/setup-java@v2
       with:
+        distribution: zulu
         java-version: 8
     - run: java -version
     - run: .kokoro/build.bat
@@ -40,14 +42,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11]
+        java: [8, 11, 17]
     steps:
     - uses: actions/checkout@v2
     - uses: stCarolas/setup-maven@v4
       with:
         maven-version: 3.8.1
-    - uses: actions/setup-java@v1
+    - uses: actions/setup-java@v2
       with:
+        distribution: zulu
         java-version: ${{matrix.java}}
     - run: java -version
     - run: .kokoro/dependencies.sh
@@ -58,8 +61,9 @@ jobs:
     - uses: stCarolas/setup-maven@v4
       with:
         maven-version: 3.8.1
-    - uses: actions/setup-java@v1
+    - uses: actions/setup-java@v2
       with:
+        distribution: zulu
         java-version: 8
     - run: java -version
     - run: .kokoro/build.sh
@@ -72,8 +76,9 @@ jobs:
     - uses: stCarolas/setup-maven@v4
       with:
         maven-version: 3.8.1
-    - uses: actions/setup-java@v1
+    - uses: actions/setup-java@v2
       with:
+        distribution: zulu
         java-version: 8
     - run: java -version
     - run: .kokoro/build.sh
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 966efcaa..970c8df9 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -69,6 +69,11 @@ integration)
       verify
     RETURN_CODE=$?
     ;;
+graalvm)
+    # Run Unit and Integration Tests with Native Image
+    mvn test -Pnative -Penable-integration-tests
+    RETURN_CODE=$?
+    ;;
 samples)
     SAMPLES_DIR=samples
     # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise.
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index 9030ba8f..9a5105d7 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -28,7 +28,28 @@ source ${scriptDir}/common.sh
 java -version
 echo $JOB_TYPE
 
-export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
+function determineMavenOpts() {
+  local javaVersion=$(
+    # filter down to the version line, then pull out the version between quotes,
+    # then trim the version number down to its minimal number (removing any
+    # update or suffix number).
+    java -version 2>&1 | grep "version" \
+      | sed -E 's/^.*"(.*?)".*$/\1/g' \
+      | sed -E 's/^(1\.[0-9]\.0).*$/\1/g'
+  )
+
+  case $javaVersion in
+    "17")
+      # MaxPermSize is no longer supported as of jdk 17
+      echo -n "-Xmx1024m"
+      ;;
+    *)
+      echo -n "-Xmx1024m -XX:MaxPermSize=128m"
+      ;;
+  esac
+}
+
+export MAVEN_OPTS=$(determineMavenOpts)
 
 # this should run maven enforcer
 retry_with_backoff 3 10 \
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
new file mode 100644
index 00000000..4c7225ec
--- /dev/null
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -0,0 +1,33 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "graalvm"
+}
+
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+  key: "GCLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "secret_manager/java-it-service-account"
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-it-service-account"
+}
diff --git a/.repo-metadata.json b/.repo-metadata.json
index f3e618eb..44236c6a 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -3,7 +3,7 @@
   "name_pretty": "Dataflow",
   "product_documentation": "https://cloud.google.com/dataflow/docs",
   "api_description": "is a managed service for executing a wide variety of data processing patterns.",
-  "client_documentation": "https://googleapis.dev/java/google-cloud-dataflow/latest/index.html",
+  "client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-dataflow/latest/history",
   "release_level": "beta",
   "transport": "grpc",
   "language": "java",
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 929bece0..23ba32e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [0.3.1](https://www.github.com/googleapis/java-dataflow/compare/v0.3.0...v0.3.1) (2021-10-19)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.4.0 ([#76](https://www.github.com/googleapis/java-dataflow/issues/76)) ([7195375](https://www.github.com/googleapis/java-dataflow/commit/71953753768f7a52728ee149c8a207ee0c1f78c9))
+
 ## [0.3.0](https://www.github.com/googleapis/java-dataflow/compare/v0.2.2...v0.3.0) (2021-09-24)
 
 
diff --git a/README.md b/README.md
index c4eec90a..52fcb338 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ If you are using Maven, add this to your pom.xml file:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-dataflow</artifactId>
-  <version>0.2.2</version>
+  <version>0.3.0</version>
 </dependency>
 
 ```
@@ -30,13 +30,13 @@ If you are using Maven, add this to your pom.xml file:
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-dataflow:0.2.2'
+implementation 'com.google.cloud:google-cloud-dataflow:0.3.0'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-dataflow" % "0.2.2"
+libraryDependencies += "com.google.cloud" % "google-cloud-dataflow" % "0.3.0"
 ```
 
 ## Authentication
@@ -166,7 +166,7 @@ Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5]
 Java is a registered trademark of Oracle and/or its affiliates.
 
 [product-docs]: https://cloud.google.com/dataflow/docs
-[javadocs]: https://googleapis.dev/java/google-cloud-dataflow/latest/index.html
+[javadocs]: https://cloud.google.com/java/docs/reference/google-cloud-dataflow/latest/history
 [kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-dataflow/java7.svg
 [kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-dataflow/java7.html
 [kokoro-badge-image-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-dataflow/java8.svg
@@ -187,10 +187,10 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [developer-console]: https://console.developers.google.com/
 [create-project]: https://cloud.google.com/resource-manager/docs/creating-managing-projects
 [cloud-sdk]: https://cloud.google.com/sdk/
-[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/master/troubleshooting/readme.md#troubleshooting
-[contributing]: https://github.com/googleapis/java-dataflow/blob/master/CONTRIBUTING.md
-[code-of-conduct]: https://github.com/googleapis/java-dataflow/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct
-[license]: https://github.com/googleapis/java-dataflow/blob/master/LICENSE
+[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/main/troubleshooting/readme.md#troubleshooting
+[contributing]: https://github.com/googleapis/java-dataflow/blob/main/CONTRIBUTING.md
+[code-of-conduct]: https://github.com/googleapis/java-dataflow/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct
+[license]: https://github.com/googleapis/java-dataflow/blob/main/LICENSE
 [enable-billing]: https://cloud.google.com/apis/docs/getting-started#enabling_billing
 [enable-api]: https://console.cloud.google.com/flows/enableapi?apiid=dataflow.googleapis.com
 [libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM
diff --git a/google-cloud-dataflow-bom/pom.xml b/google-cloud-dataflow-bom/pom.xml
index d598352a..34494142 100644
--- a/google-cloud-dataflow-bom/pom.xml
+++ b/google-cloud-dataflow-bom/pom.xml
@@ -3,12 +3,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-dataflow-bom</artifactId>
-  <version>0.3.0</version><!-- {x-version-update:google-cloud-dataflow:current} -->
+  <version>0.3.1</version><!-- {x-version-update:google-cloud-dataflow:current} -->
   <packaging>pom</packaging>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.0.3</version>
+    <version>1.1.0</version>
   </parent>
 
   <name>Google Dataflow BOM</name>
@@ -56,17 +56,17 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-dataflow</artifactId>
-        <version>0.3.0</version><!-- {x-version-update:google-cloud-dataflow:current} -->
+        <version>0.3.1</version><!-- {x-version-update:google-cloud-dataflow:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-dataflow-v1beta3</artifactId>
-        <version>0.3.0</version><!-- {x-version-update:grpc-google-cloud-dataflow-v1beta3:current} -->
+        <version>0.3.1</version><!-- {x-version-update:grpc-google-cloud-dataflow-v1beta3:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-dataflow-v1beta3</artifactId>
-        <version>0.3.0</version><!-- {x-version-update:proto-google-cloud-dataflow-v1beta3:current} -->
+        <version>0.3.1</version><!-- {x-version-update:proto-google-cloud-dataflow-v1beta3:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/google-cloud-dataflow/pom.xml b/google-cloud-dataflow/pom.xml
index 46fb8148..5f1e0684 100644
--- a/google-cloud-dataflow/pom.xml
+++ b/google-cloud-dataflow/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-dataflow</artifactId>
-  <version>0.3.0</version><!-- {x-version-update:google-cloud-dataflow:current} -->
+  <version>0.3.1</version><!-- {x-version-update:google-cloud-dataflow:current} -->
   <packaging>jar</packaging>
   <name>Google Dataflow</name>
   <url>https://github.com/googleapis/java-dataflow</url>
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-dataflow-parent</artifactId>
-    <version>0.3.0</version><!-- {x-version-update:google-cloud-dataflow:current} -->
+    <version>0.3.1</version><!-- {x-version-update:google-cloud-dataflow:current} -->
   </parent>
   <properties>
     <site.installationModule>google-cloud-dataflow</site.installationModule>
diff --git a/grpc-google-cloud-dataflow-v1beta3/pom.xml b/grpc-google-cloud-dataflow-v1beta3/pom.xml
index 5f5f0a53..170e0136 100644
--- a/grpc-google-cloud-dataflow-v1beta3/pom.xml
+++ b/grpc-google-cloud-dataflow-v1beta3/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>grpc-google-cloud-dataflow-v1beta3</artifactId>
-  <version>0.3.0</version><!-- {x-version-update:grpc-google-cloud-dataflow-v1beta3:current} -->
+  <version>0.3.1</version><!-- {x-version-update:grpc-google-cloud-dataflow-v1beta3:current} -->
   <name>grpc-google-cloud-dataflow-v1beta3</name>
   <description>GRPC library for google-cloud-dataflow</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-dataflow-parent</artifactId>
-    <version>0.3.0</version><!-- {x-version-update:google-cloud-dataflow:current} -->
+    <version>0.3.1</version><!-- {x-version-update:google-cloud-dataflow:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 7352c628..2f3ae23e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-dataflow-parent</artifactId>
   <packaging>pom</packaging>
-  <version>0.3.0</version><!-- {x-version-update:google-cloud-dataflow:current} -->
+  <version>0.3.1</version><!-- {x-version-update:google-cloud-dataflow:current} -->
   <name>Google Dataflow Parent</name>
   <url>https://github.com/googleapis/java-dataflow</url>
   <description>
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.0.3</version>
+    <version>1.1.0</version>
   </parent>
 
   <developers>
@@ -69,23 +69,23 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-dataflow</artifactId>
-        <version>0.3.0</version><!-- {x-version-update:google-cloud-dataflow:current} -->
+        <version>0.3.1</version><!-- {x-version-update:google-cloud-dataflow:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-dataflow-v1beta3</artifactId>
-        <version>0.3.0</version><!-- {x-version-update:grpc-google-cloud-dataflow-v1beta3:current} -->
+        <version>0.3.1</version><!-- {x-version-update:grpc-google-cloud-dataflow-v1beta3:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-dataflow-v1beta3</artifactId>
-        <version>0.3.0</version><!-- {x-version-update:proto-google-cloud-dataflow-v1beta3:current} -->
+        <version>0.3.1</version><!-- {x-version-update:proto-google-cloud-dataflow-v1beta3:current} -->
       </dependency>
 
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-shared-dependencies</artifactId>
-        <version>2.3.0</version>
+        <version>2.4.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/proto-google-cloud-dataflow-v1beta3/pom.xml b/proto-google-cloud-dataflow-v1beta3/pom.xml
index 5793e8bf..7904fb21 100644
--- a/proto-google-cloud-dataflow-v1beta3/pom.xml
+++ b/proto-google-cloud-dataflow-v1beta3/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>proto-google-cloud-dataflow-v1beta3</artifactId>
-  <version>0.3.0</version><!-- {x-version-update:proto-google-cloud-dataflow-v1beta3:current} -->
+  <version>0.3.1</version><!-- {x-version-update:proto-google-cloud-dataflow-v1beta3:current} -->
   <name>proto-google-cloud-dataflow-v1beta3</name>
   <description>Proto library for google-cloud-dataflow</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-dataflow-parent</artifactId>
-    <version>0.3.0</version><!-- {x-version-update:google-cloud-dataflow:current} -->
+    <version>0.3.1</version><!-- {x-version-update:google-cloud-dataflow:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 925d6972..c7ef64e3 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-dataflow</artifactId>
-      <version>0.2.2</version>
+      <version>0.3.0</version>
     </dependency>
     <!-- [END dataflow_install_without_bom] -->
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 9cd27092..5e5f7f4c 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-dataflow</artifactId>
-      <version>0.2.2</version>
+      <version>0.3.0</version>
     </dependency>
   <!-- {x-version-update-end} -->
 
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index dfc400ae..2d58515c 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-dataflow</artifactId>
-      <version>0.2.2</version>
+      <version>0.3.0</version>
     </dependency>
 
     <dependency>
diff --git a/versions.txt b/versions.txt
index 9729f1f9..1e6611a1 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,6 +1,6 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-dataflow:0.3.0:0.3.0
-grpc-google-cloud-dataflow-v1beta3:0.3.0:0.3.0
-proto-google-cloud-dataflow-v1beta3:0.3.0:0.3.0
+google-cloud-dataflow:0.3.1:0.3.1
+grpc-google-cloud-dataflow-v1beta3:0.3.1:0.3.1
+proto-google-cloud-dataflow-v1beta3:0.3.1:0.3.1