diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 7889305394b..929388bc246 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -6,6 +6,7 @@
 
 ---
 
-<!--- REMINDER: Ensure that your PR meets the guidelines in CONTRIBUTING.md -->
+- Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time.
+- Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
 
 License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 964f6da9df9..c4dba3042e2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -238,9 +238,12 @@ You can find documentation to create VSCode IDE settings for CodeCatalyst bluepr
 
 Before sending a pull request:
 
+1. Treat all work as PUBLIC. Private `feature/x` branches will _not_ be squash-merged at release time. This has several benefits:
+    - Avoids mistakes (accidental exposure to public)!
+    - Avoids needing to erase (squash-merge) history.
 1. Check that you are working against the latest source on the `master` branch.
-2. Check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
-3. Open an issue to discuss any significant work.
+1. Check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
+1. Open an issue to discuss any significant work.
 
 To send a pull request:
 
diff --git a/buildspec/shared/common.sh b/buildspec/shared/common.sh
index 704f97799d8..cce614e4406 100644
--- a/buildspec/shared/common.sh
+++ b/buildspec/shared/common.sh
@@ -6,13 +6,9 @@
 
 # Ignore these patterns when deciding if the build should fail.
 #   - "waiting for browser": from `ssoAccessTokenProvider.test.ts`, unclear how to fix it.
-#   - "Webview is disposed": only happens on vscode "minimum" (1.68.0)
 #   - "HTTPError: Response code …": caused by github rate-limiting.
 #   - "npm WARN deprecated querystring": transitive dep of aws sdk v2 (check `npm ls querystring`), so that's blocked until we migrate to v3.
 _ignore_pat='Timed-out waiting for browser login flow\|HTTPError: Response code 403\|HTTPError: Response code 404\|npm WARN deprecated querystring\|npm WARN deprecated'
-if [ "$VSCODE_TEST_VERSION" = 'minimum' ]; then
-    _ignore_pat="$_ignore_pat"'\|Webview is disposed'
-fi
 
 # Do not print (noisy) lines matching these patterns.
 #   - "ERROR:bus… Failed to connect to the bus": noise related to "xvfb". https://github.com/cypress-io/cypress/issues/19299
diff --git a/packages/amazonq/README.md b/packages/amazonq/README.md
index 6fe90e3fec2..46091a98d10 100644
--- a/packages/amazonq/README.md
+++ b/packages/amazonq/README.md
@@ -6,18 +6,23 @@
 # Agent capabilities
 
 ### Implement new features
+
 `/dev` to task Amazon Q with generating new code across your entire project and implement features.
 
 ### Generate documentation
-`/docs` to task Amazon Q with writing API, technical design, and onboarding documentation.
+
+`/doc` to task Amazon Q with writing API, technical design, and onboarding documentation.
 
 ### Automate code reviews
+
 `/review` to ask Amazon Q to perform code reviews, flagging suspicious code patterns and assessing deployment risk.
 
 ### Generate unit tests
+
 `/test` to ask Amazon Q to generate unit tests and add them to your project, helping you improve code quality, fast.
 
 ### Transform workloads
+
 `/transform` to upgrade your Java applications in minutes, not weeks.
 
 <br>
@@ -25,12 +30,15 @@
 # Core features
 
 ### Inline chat
+
 Seamlessly initiate chat within the inline coding experience. Select a section of code that you need assistance with and initiate chat within the editor to request actions such as "Optimize this code", "Add comments", or "Write tests".
 
 ### Chat
+
 Generate code, explain code, and get answers about software development.
 
 ### Inline suggestions
+
 Receive real-time code suggestions ranging from snippets to full functions based on your comments and existing code.
 
 [_15+ languages supported including Python, TypeScript, Rust, Terraform, AWS Cloudformation, and more_](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/q-language-ide-support.html)
@@ -51,4 +59,4 @@ Attribute code from Amazon Q that is similar to training data. When code suggest
 
 # Troubleshooting & feedback
 
-[File a bug](https://github.com/aws/aws-toolkit-vscode/issues/new?assignees=&labels=bug&projects=&template=bug_report.md) or [submit a feature request](https://github.com/aws/aws-toolkit-vscode/issues/new?assignees=&labels=feature-request&projects=&template=feature_request.md) on our Github repository.
\ No newline at end of file
+[File a bug](https://github.com/aws/aws-toolkit-vscode/issues/new?assignees=&labels=bug&projects=&template=bug_report.md) or [submit a feature request](https://github.com/aws/aws-toolkit-vscode/issues/new?assignees=&labels=feature-request&projects=&template=feature_request.md) on our Github repository.