Opentrons · mcous · Oct 12, 2020 · Oct 9, 2020 · Oct 9, 2020 · Oct 9, 2020
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.21.1-alpha.0](https://github.com/Opentrons/opentrons/compare/v3.21.0...v3.21.1-alpha.0) (2020-10-09)
+
+
+### Features
+
+* **app:** allow app update pop-up notifications to be disabled ([#6715](https://github.com/Opentrons/opentrons/issues/6715)) ([7982d5f](https://github.com/Opentrons/opentrons/commit/7982d5f)), closes [#6684](https://github.com/Opentrons/opentrons/issues/6684)
+* **components:** add primitives-based BaseModal layout component ([#6687](https://github.com/Opentrons/opentrons/issues/6687)) ([dfa0b0d](https://github.com/Opentrons/opentrons/commit/dfa0b0d))
+
+
+
+
+
 # [3.21.0](https://github.com/Opentrons/opentrons/compare/v3.20.1...v3.21.0) (2020-09-30)
 
 

diff --git a/api/release-notes.md b/api/release-notes.md
@@ -1,12 +1,20 @@
-# Robot OS Changes from 3.20.1 to 3.21.0
-
 For more details about this release, please see the full [technical change
 log][]. For a list of currently known issues, please see the [Opentrons issue tracker][].
 
 [technical change log]: https://github.com/Opentrons/opentrons/blob/edge/CHANGELOG.md
 [opentrons issue tracker]: https://github.com/Opentrons/opentrons/issues?q=is%3Aopen+is%3Aissue+label%3Abug
 
-## Fixes
+---
+
+## OT-2 Software Changes in 3.21.1
+
+No changes - version bump only for synchronization with Opentrons App.
+
+---
+
+## OT-2 Software Changes in 3.21.0
+
+### Fixes
 
 - Prevent HardLimitErrors when jogging during labware calibration
   - The robot will now refuse to execute jog commands if it thinks doing so will cause it to hit an axis limit
@@ -20,7 +28,7 @@ log][]. For a list of currently known issues, please see the [Opentrons issue tr
 
 [pr 6260]: https://github.com/Opentrons/opentrons/pull/6260
 
-## Features
+### Features
 
 - Check if an instrument has a tip through the Python Protocol API
   - Using `apiLevel: '2.7'` in your Python protocol will allow you to access the new `has_tip` property of a given pipette

diff --git a/api/src/opentrons/CHANGELOG.md b/api/src/opentrons/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.21.1-alpha.0](https://github.com/Opentrons/opentrons/compare/v3.21.0...v3.21.1-alpha.0) (2020-10-09)
+
+**Note:** Version bump only for package @opentrons/api-server
+
+
+
+
+
 # [3.21.0](https://github.com/Opentrons/opentrons/compare/v3.20.1...v3.21.0) (2020-09-30)
 
 

diff --git a/api/src/opentrons/package.json b/api/src/opentrons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentrons/api-server",
-  "version": "3.21.0",
+  "version": "3.21.1-alpha.0",
   "description": "Opentrons API server application",
   "repository": {
     "type": "git",

diff --git a/app-shell/CHANGELOG.md b/app-shell/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.21.1-alpha.0](https://github.com/Opentrons/opentrons/compare/v3.21.0...v3.21.1-alpha.0) (2020-10-09)
+
+**Note:** Version bump only for package @opentrons/app-shell
+
+
+
+
+
 # [3.21.0](https://github.com/Opentrons/opentrons/compare/v3.20.1...v3.21.0) (2020-09-30)
 
 

diff --git a/app-shell/build/release-notes.md b/app-shell/build/release-notes.md
@@ -1,12 +1,24 @@
-# Opentrons App Changes from 3.20.0 to 3.20.1
-
 For more details about this release, please see the full [technical change
 log][]. For a list of currently known issues, please see the [Opentrons issue tracker][].
 
 [technical change log]: https://github.com/Opentrons/opentrons/blob/edge/CHANGELOG.md
 [opentrons issue tracker]: https://github.com/Opentrons/opentrons/issues?q=is%3Aopen+is%3Aissue+label%3Abug
 
-## Fixes
+---
+
+## Opentrons App Changes in 3.21.1
+
+### Features
+
+- You can now disable app update pop-up notifications in More > App > App Software Settings
+
+&nbsp;
+
+---
+
+## Opentrons App Changes in 3.21.0
+
+### Fixes
 
 - Properly enable / disable the "Update robot software from file" button
   - This button was sometimes enabled and disabled at improper times
@@ -18,7 +30,7 @@ log][]. For a list of currently known issues, please see the [Opentrons issue tr
 - Ensure modules render correctly in the deck map when loaded in slot 3, 6, or 9
 - Ensure "Last Updated" times for custom labware are correct
 
-## Features
+### Features
 
 - Automatically sync the OT-2's clock with the App on connect
   - When the App connects to an OT-2 running v3.21.0, it will sync the OT-2's clock with your computer's clock

diff --git a/app-shell/package.json b/app-shell/package.json
@@ -2,7 +2,7 @@
   "name": "@opentrons/app-shell",
   "private": true,
   "productName": "Opentrons",
-  "version": "3.21.0",
+  "version": "3.21.1-alpha.0",
   "description": "Opentrons desktop application",
   "main": "lib/main.js",
   "scripts": {
@@ -27,9 +27,9 @@
     ]
   },
   "devDependencies": {
-    "@opentrons/app": "3.21.0",
-    "@opentrons/discovery-client": "3.21.0",
-    "@opentrons/shared-data": "3.21.0"
+    "@opentrons/app": "3.21.1-alpha.0",
+    "@opentrons/discovery-client": "3.21.1-alpha.0",
+    "@opentrons/shared-data": "3.21.1-alpha.0"
   },
   "dependencies": {
     "@thi.ng/paths": "1.6.5",

diff --git a/app/CHANGELOG.md b/app/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.21.1-alpha.0](https://github.com/Opentrons/opentrons/compare/v3.21.0...v3.21.1-alpha.0) (2020-10-09)
+
+
+### Features
+
+* **app:** allow app update pop-up notifications to be disabled ([#6715](https://github.com/Opentrons/opentrons/issues/6715)) ([7982d5f](https://github.com/Opentrons/opentrons/commit/7982d5f)), closes [#6684](https://github.com/Opentrons/opentrons/issues/6684)
+
+
+
+
+
 # [3.21.0](https://github.com/Opentrons/opentrons/compare/v3.20.1...v3.21.0) (2020-09-30)
 
 

diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentrons/app",
-  "version": "3.21.0",
+  "version": "3.21.1-alpha.0",
   "description": "Opentrons desktop application UI",
   "main": "src/index.js",
   "repository": {
@@ -18,8 +18,8 @@
   "homepage": "https://github.com/Opentrons/opentrons",
   "dependencies": {
     "@hot-loader/react-dom": "16.8.6",
-    "@opentrons/components": "3.21.0",
-    "@opentrons/shared-data": "3.21.0",
+    "@opentrons/components": "3.21.1-alpha.0",
+    "@opentrons/shared-data": "3.21.1-alpha.0",
     "@thi.ng/paths": "1.6.5",
     "classnames": "2.2.5",
     "connected-react-router": "6.8.0",

diff --git a/components/CHANGELOG.md b/components/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.21.1-alpha.0](https://github.com/Opentrons/opentrons/compare/v3.21.0...v3.21.1-alpha.0) (2020-10-09)
+
+
+### Features
+
+* **app:** allow app update pop-up notifications to be disabled ([#6715](https://github.com/Opentrons/opentrons/issues/6715)) ([7982d5f](https://github.com/Opentrons/opentrons/commit/7982d5f)), closes [#6684](https://github.com/Opentrons/opentrons/issues/6684)
+* **components:** add primitives-based BaseModal layout component ([#6687](https://github.com/Opentrons/opentrons/issues/6687)) ([dfa0b0d](https://github.com/Opentrons/opentrons/commit/dfa0b0d))
+
+
+
+
+
 # [3.21.0](https://github.com/Opentrons/opentrons/compare/v3.20.1...v3.21.0) (2020-09-30)
 
 

diff --git a/components/package.json b/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentrons/components",
-  "version": "3.21.0",
+  "version": "3.21.1-alpha.0",
   "description": "React components library for Opentrons' projects",
   "main": "src/index.js",
   "style": "src/index.css",

diff --git a/discovery-client/CHANGELOG.md b/discovery-client/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.21.1-alpha.0](https://github.com/Opentrons/opentrons/compare/v3.21.0...v3.21.1-alpha.0) (2020-10-09)
+
+**Note:** Version bump only for package @opentrons/discovery-client
+
+
+
+
+
 # [3.21.0](https://github.com/Opentrons/opentrons/compare/v3.20.1...v3.21.0) (2020-09-30)
 
 **Note:** Version bump only for package @opentrons/discovery-client

diff --git a/discovery-client/package.json b/discovery-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentrons/discovery-client",
-  "version": "3.21.0",
+  "version": "3.21.1-alpha.0",
   "description": "Node.js client for discovering Opentrons robots on the network",
   "main": "src/index.js",
   "bin": {

diff --git a/labware-designer/CHANGELOG.md b/labware-designer/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.21.1-alpha.0](https://github.com/Opentrons/opentrons/compare/v3.21.0...v3.21.1-alpha.0) (2020-10-09)
+
+**Note:** Version bump only for package labware-designer
+
+
+
+
+
 # [3.21.0](https://github.com/Opentrons/opentrons/compare/v3.20.1...v3.21.0) (2020-09-30)
 
 **Note:** Version bump only for package labware-designer

diff --git a/labware-designer/package.json b/labware-designer/package.json
@@ -10,7 +10,7 @@
   "name": "labware-designer",
   "productName": "Opentrons Labware Designer",
   "private": true,
-  "version": "3.21.0",
+  "version": "3.21.1-alpha.0",
   "description": "Labware Designer",
   "main": "src/index.js",
   "bugs": {
@@ -19,6 +19,6 @@
   "homepage": "https://github.com/Opentrons/opentrons",
   "license": "Apache-2.0",
   "dependencies": {
-    "@opentrons/shared-data": "3.21.0"
+    "@opentrons/shared-data": "3.21.1-alpha.0"
   }
 }
diff --git a/labware-library/CHANGELOG.md b/labware-library/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.21.1-alpha.0](https://github.com/Opentrons/opentrons/compare/v3.21.0...v3.21.1-alpha.0) (2020-10-09)
+
+**Note:** Version bump only for package @opentrons/labware-library
+
+
+
+
+
 # [3.21.0](https://github.com/Opentrons/opentrons/compare/v3.20.1...v3.21.0) (2020-09-30)
 
 

diff --git a/labware-library/package.json b/labware-library/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@opentrons/labware-library",
   "productName": "Labware Library",
-  "version": "3.21.0",
+  "version": "3.21.1-alpha.0",
   "description": "Opentrons standard labware library",
   "main": "src/index.js",
   "repository": {
@@ -16,7 +16,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@hot-loader/react-dom": "16.8.6",
-    "@opentrons/components": "3.21.0",
+    "@opentrons/components": "3.21.1-alpha.0",
     "ajv": "6.10.2",
     "classnames": "2.2.5",
     "cookie": "0.4.0",

diff --git a/lerna.json b/lerna.json
@@ -15,5 +15,5 @@
   },
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "3.21.0"
+  "version": "3.21.1-alpha.0"
 }
diff --git a/protocol-designer/CHANGELOG.md b/protocol-designer/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.21.1-alpha.0](https://github.com/Opentrons/opentrons/compare/v3.21.0...v3.21.1-alpha.0) (2020-10-09)
+
+**Note:** Version bump only for package protocol-designer
+
+
+
+
+
 # [3.21.0](https://github.com/Opentrons/opentrons/compare/v3.20.1...v3.21.0) (2020-09-30)
 
 

diff --git a/protocol-designer/package.json b/protocol-designer/package.json
@@ -10,7 +10,7 @@
   "name": "protocol-designer",
   "productName": "Opentrons Protocol Designer BETA",
   "private": true,
-  "version": "3.21.0",
+  "version": "3.21.1-alpha.0",
   "description": "Protocol designer app",
   "main": "src/index.js",
   "bugs": {
@@ -20,7 +20,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@hot-loader/react-dom": "16.8.6",
-    "@opentrons/components": "3.21.0",
+    "@opentrons/components": "3.21.1-alpha.0",
     "@typeform/embed": "0.16.0",
     "ajv": "6.10.2",
     "classnames": "2.2.5",

diff --git a/protocol-library-kludge/CHANGELOG.md b/protocol-library-kludge/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.21.1-alpha.0](https://github.com/Opentrons/opentrons/compare/v3.21.0...v3.21.1-alpha.0) (2020-10-09)
+
+**Note:** Version bump only for package protocol-library-kludge
+
+
+
+
+
 # [3.21.0](https://github.com/Opentrons/opentrons/compare/v3.20.1...v3.21.0) (2020-09-30)
 
 

diff --git a/protocol-library-kludge/package.json b/protocol-library-kludge/package.json
@@ -9,7 +9,7 @@
   },
   "name": "protocol-library-kludge",
   "private": true,
-  "version": "3.21.0",
+  "version": "3.21.1-alpha.0",
   "productName": "Opentrons Protocol Library",
   "description": "Protocol library stuff (WIP)",
   "main": "src/index.js",
@@ -20,8 +20,8 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@hot-loader/react-dom": "16.8.6",
-    "@opentrons/components": "3.21.0",
-    "@opentrons/shared-data": "3.21.0",
+    "@opentrons/components": "3.21.1-alpha.0",
+    "@opentrons/shared-data": "3.21.1-alpha.0",
     "classnames": "2.2.5",
     "lodash": "4.17.15",
     "react": "16.8.6",

diff --git a/robot-server/robot_server/CHANGELOG.md b/robot-server/robot_server/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.21.1-alpha.0](https://github.com/Opentrons/opentrons/compare/v3.21.0...v3.21.1-alpha.0) (2020-10-09)
+
+**Note:** Version bump only for package @opentrons/robot-server
+
+
+
+
+
 # [3.21.0](https://github.com/Opentrons/opentrons/compare/v3.20.1...v3.21.0) (2020-09-30)
 
 

diff --git a/robot-server/robot_server/package.json b/robot-server/robot_server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentrons/robot-server",
-  "version": "3.21.0",
+  "version": "3.21.1-alpha.0",
   "description": "HTTP server for Opentrons robots",
   "repository": {
     "type": "git",