diff --git a/CHANGELOG.md b/CHANGELOG.md
index edc6486a44..96e8a69b2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,22 @@
 # CHANGELOG
 
-## 3.6.x
+## 3.6.1 Jan 24, 2020
 
-Upgrade priority: Medium if not already on at least 3.3.1. The next upgrade of Kusama requires it.
+Upgrade priority: Medium if not already on at least 3.3.1. The next upgrade of Kusama/Polkadot requires it.
 
 - **Breaking change** To support chains with multiple tokens, such as bridges, the `ChainProperties` type now returns an array of tokens and decimals (instead of singular values) in the `token{Decimals, Symbol}` getters. Additionally, this means that the `registry` interfaces has been changes, to `registry.chainDecimals: number[]` and `registry.chainTokens: string[]`. Where used the `[0]` index will return the first value if only interested in a single, for a straight conversion.
 
 Changes:
 
+- Allow for the detection of on-chain capabilities as available (e.g. `AccountData`, `ValidatorPrefs`)
 - Cater for multiple tokens and decimals in the chain the chain `system.properties` (as per the chain specification)
 - Add a `instances: { [key]: [module1, module2] }` definition in teh bundle types, allowing for multiple instances (e.g. Balances)
 - Adjust the `api-derive` for balances to retrieve values via `instances` as well as across multiple modules
+- Ensure all types are registered for all metadata typegen steps
+- Add `rpc.payment.queryFeeDetails` RPC endpoint
+- Update types & metadata to latest Substrate
+- Move the `@polkadot/x-rxjs` package into the common repo
+- Allow doc generation for errors/events (markdown outputs)
 
 
 ## 3.5.1 Jan 18, 2020
diff --git a/package.json b/package.json
index 9f6bda1871..e424970b07 100644
--- a/package.json
+++ b/package.json
@@ -34,5 +34,5 @@
     "@types/jest": "^26.0.20",
     "copyfiles": "^2.4.1"
   },
-  "version": "3.5.2-16"
+  "version": "3.6.0"
 }
diff --git a/packages/api-contract/package.json b/packages/api-contract/package.json
index d5931e96a1..71b1483f16 100644
--- a/packages/api-contract/package.json
+++ b/packages/api-contract/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api-contract",
-  "version": "3.5.2-16",
+  "version": "3.6.0",
   "description": "Interfaces for interacting with contracts and contract ABIs",
   "main": "index.js",
   "sideEffects": false,
@@ -13,8 +13,8 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-contract#readme",
   "dependencies": {
     "@babel/runtime": "^7.12.5",
-    "@polkadot/api": "3.5.2-16",
-    "@polkadot/types": "3.5.2-16",
+    "@polkadot/api": "3.6.0",
+    "@polkadot/types": "3.6.0",
     "@polkadot/util": "^5.4.2",
     "@polkadot/x-rxjs": "^5.4.2",
     "bn.js": "^4.11.9"
diff --git a/packages/api-derive/package.json b/packages/api-derive/package.json
index 297b2664cb..937bb5a6e9 100644
--- a/packages/api-derive/package.json
+++ b/packages/api-derive/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api-derive",
-  "version": "3.5.2-16",
+  "version": "3.6.0",
   "description": "Common functions used across Polkadot, derived from RPC calls and storage queries.",
   "main": "index.js",
   "sideEffects": false,
@@ -13,9 +13,9 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-derive#readme",
   "dependencies": {
     "@babel/runtime": "^7.12.5",
-    "@polkadot/api": "3.5.2-16",
-    "@polkadot/rpc-core": "3.5.2-16",
-    "@polkadot/types": "3.5.2-16",
+    "@polkadot/api": "3.6.0",
+    "@polkadot/rpc-core": "3.6.0",
+    "@polkadot/types": "3.6.0",
     "@polkadot/util": "^5.4.2",
     "@polkadot/util-crypto": "^5.4.2",
     "@polkadot/x-rxjs": "^5.4.2",
@@ -23,6 +23,6 @@
   },
   "devDependencies": {
     "@polkadot/keyring": "^5.4.2",
-    "@polkadot/rpc-provider": "3.5.2-16"
+    "@polkadot/rpc-provider": "3.6.0"
   }
 }
diff --git a/packages/api/package.json b/packages/api/package.json
index cf917f48a0..cb768a4ba5 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api",
-  "version": "3.5.2-16",
+  "version": "3.6.0",
   "description": "Promise and RxJS wrappers around the Polkadot JS RPC",
   "main": "index.js",
   "sideEffects": [
@@ -16,13 +16,13 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api#readme",
   "dependencies": {
     "@babel/runtime": "^7.12.5",
-    "@polkadot/api-derive": "3.5.2-16",
+    "@polkadot/api-derive": "3.6.0",
     "@polkadot/keyring": "^5.4.2",
-    "@polkadot/metadata": "3.5.2-16",
-    "@polkadot/rpc-core": "3.5.2-16",
-    "@polkadot/rpc-provider": "3.5.2-16",
-    "@polkadot/types": "3.5.2-16",
-    "@polkadot/types-known": "3.5.2-16",
+    "@polkadot/metadata": "3.6.0",
+    "@polkadot/rpc-core": "3.6.0",
+    "@polkadot/rpc-provider": "3.6.0",
+    "@polkadot/types": "3.6.0",
+    "@polkadot/types-known": "3.6.0",
     "@polkadot/util": "^5.4.2",
     "@polkadot/util-crypto": "^5.4.2",
     "@polkadot/x-rxjs": "^5.4.2",
diff --git a/packages/metadata/package.json b/packages/metadata/package.json
index 0cceab4e30..3f97c5f6c1 100644
--- a/packages/metadata/package.json
+++ b/packages/metadata/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/metadata",
-  "version": "3.5.2-16",
+  "version": "3.6.0",
   "description": "Helpers to extract information from runtime metadata",
   "main": "index.js",
   "sideEffects": [
@@ -16,8 +16,8 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/type-metadata#readme",
   "dependencies": {
     "@babel/runtime": "^7.12.5",
-    "@polkadot/types": "3.5.2-16",
-    "@polkadot/types-known": "3.5.2-16",
+    "@polkadot/types": "3.6.0",
+    "@polkadot/types-known": "3.6.0",
     "@polkadot/util": "^5.4.2",
     "@polkadot/util-crypto": "^5.4.2",
     "bn.js": "^4.11.9"
diff --git a/packages/rpc-core/package.json b/packages/rpc-core/package.json
index ed17eae34b..e625d2da45 100644
--- a/packages/rpc-core/package.json
+++ b/packages/rpc-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/rpc-core",
-  "version": "3.5.2-16",
+  "version": "3.6.0",
   "description": "A JavaScript wrapper for the Polkadot JsonRPC interface",
   "main": "index.js",
   "sideEffects": false,
@@ -13,9 +13,9 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/rpc-core#readme",
   "dependencies": {
     "@babel/runtime": "^7.12.5",
-    "@polkadot/metadata": "3.5.2-16",
-    "@polkadot/rpc-provider": "3.5.2-16",
-    "@polkadot/types": "3.5.2-16",
+    "@polkadot/metadata": "3.6.0",
+    "@polkadot/rpc-provider": "3.6.0",
+    "@polkadot/types": "3.6.0",
     "@polkadot/util": "^5.4.2",
     "@polkadot/x-rxjs": "^5.4.2"
   },
diff --git a/packages/rpc-provider/package.json b/packages/rpc-provider/package.json
index d52096c491..852c6ea241 100644
--- a/packages/rpc-provider/package.json
+++ b/packages/rpc-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/rpc-provider",
-  "version": "3.5.2-16",
+  "version": "3.6.0",
   "description": "Transport providers for the API",
   "main": "index.js",
   "sideEffects": false,
@@ -13,7 +13,7 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/rpc-provider#readme",
   "dependencies": {
     "@babel/runtime": "^7.12.5",
-    "@polkadot/types": "3.5.2-16",
+    "@polkadot/types": "3.6.0",
     "@polkadot/util": "^5.4.2",
     "@polkadot/util-crypto": "^5.4.2",
     "@polkadot/x-fetch": "^5.4.2",
@@ -23,7 +23,7 @@
   },
   "devDependencies": {
     "@polkadot/keyring": "^5.4.2",
-    "@polkadot/metadata": "3.5.2-16",
+    "@polkadot/metadata": "3.6.0",
     "mock-socket": "^9.0.3",
     "nock": "^13.0.6"
   }
diff --git a/packages/typegen/package.json b/packages/typegen/package.json
index 71cef4d704..31d47d6b9e 100644
--- a/packages/typegen/package.json
+++ b/packages/typegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/typegen",
-  "version": "3.5.2-16",
+  "version": "3.6.0",
   "description": "Type generation scripts",
   "main": "index.js",
   "sideEffects": false,
@@ -22,10 +22,10 @@
     "@babel/core": "^7.12.10",
     "@babel/register": "^7.12.10",
     "@babel/runtime": "^7.12.5",
-    "@polkadot/api": "3.5.2-16",
-    "@polkadot/metadata": "3.5.2-16",
-    "@polkadot/rpc-provider": "3.5.2-16",
-    "@polkadot/types": "3.5.2-16",
+    "@polkadot/api": "3.6.0",
+    "@polkadot/metadata": "3.6.0",
+    "@polkadot/rpc-provider": "3.6.0",
+    "@polkadot/types": "3.6.0",
     "@polkadot/util": "^5.4.2",
     "handlebars": "^4.7.6",
     "websocket": "^1.0.33",
diff --git a/packages/types-known/package.json b/packages/types-known/package.json
index b3af48b979..a959c4852a 100644
--- a/packages/types-known/package.json
+++ b/packages/types-known/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/types-known",
-  "version": "3.5.2-16",
+  "version": "3.6.0",
   "description": "A JavaScript wrapper for the Polkadot JsonRPC interface",
   "main": "index.js",
   "sideEffects": false,
@@ -13,7 +13,7 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/types-known#readme",
   "dependencies": {
     "@babel/runtime": "^7.12.5",
-    "@polkadot/types": "3.5.2-16",
+    "@polkadot/types": "3.6.0",
     "@polkadot/util": "^5.4.2",
     "bn.js": "^4.11.9"
   },
diff --git a/packages/types/package.json b/packages/types/package.json
index e9f3155395..5e062eff6f 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/types",
-  "version": "3.5.2-16",
+  "version": "3.6.0",
   "description": "Implementation of the Parity codec",
   "main": "index.js",
   "sideEffects": [
@@ -16,7 +16,7 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/types#readme",
   "dependencies": {
     "@babel/runtime": "^7.12.5",
-    "@polkadot/metadata": "3.5.2-16",
+    "@polkadot/metadata": "3.6.0",
     "@polkadot/util": "^5.4.2",
     "@polkadot/util-crypto": "^5.4.2",
     "@polkadot/x-rxjs": "^5.4.2",
diff --git a/yarn.lock b/yarn.lock
index dad757c88f..c9ec75e280 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1622,24 +1622,24 @@ __metadata:
   resolution: "@polkadot/api-contract@workspace:packages/api-contract"
   dependencies:
     "@babel/runtime": ^7.12.5
-    "@polkadot/api": 3.5.2-16
-    "@polkadot/types": 3.5.2-16
+    "@polkadot/api": 3.6.0
+    "@polkadot/types": 3.6.0
     "@polkadot/util": ^5.4.2
     "@polkadot/x-rxjs": ^5.4.2
     bn.js: ^4.11.9
   languageName: unknown
   linkType: soft
 
-"@polkadot/api-derive@3.5.2-16, @polkadot/api-derive@workspace:packages/api-derive":
+"@polkadot/api-derive@3.6.0, @polkadot/api-derive@workspace:packages/api-derive":
   version: 0.0.0-use.local
   resolution: "@polkadot/api-derive@workspace:packages/api-derive"
   dependencies:
     "@babel/runtime": ^7.12.5
-    "@polkadot/api": 3.5.2-16
+    "@polkadot/api": 3.6.0
     "@polkadot/keyring": ^5.4.2
-    "@polkadot/rpc-core": 3.5.2-16
-    "@polkadot/rpc-provider": 3.5.2-16
-    "@polkadot/types": 3.5.2-16
+    "@polkadot/rpc-core": 3.6.0
+    "@polkadot/rpc-provider": 3.6.0
+    "@polkadot/types": 3.6.0
     "@polkadot/util": ^5.4.2
     "@polkadot/util-crypto": ^5.4.2
     "@polkadot/x-rxjs": ^5.4.2
@@ -1647,18 +1647,18 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/api@3.5.2-16, @polkadot/api@workspace:packages/api":
+"@polkadot/api@3.6.0, @polkadot/api@workspace:packages/api":
   version: 0.0.0-use.local
   resolution: "@polkadot/api@workspace:packages/api"
   dependencies:
     "@babel/runtime": ^7.12.5
-    "@polkadot/api-derive": 3.5.2-16
+    "@polkadot/api-derive": 3.6.0
     "@polkadot/keyring": ^5.4.2
-    "@polkadot/metadata": 3.5.2-16
-    "@polkadot/rpc-core": 3.5.2-16
-    "@polkadot/rpc-provider": 3.5.2-16
-    "@polkadot/types": 3.5.2-16
-    "@polkadot/types-known": 3.5.2-16
+    "@polkadot/metadata": 3.6.0
+    "@polkadot/rpc-core": 3.6.0
+    "@polkadot/rpc-provider": 3.6.0
+    "@polkadot/types": 3.6.0
+    "@polkadot/types-known": 3.6.0
     "@polkadot/util": ^5.4.2
     "@polkadot/util-crypto": ^5.4.2
     "@polkadot/x-rxjs": ^5.4.2
@@ -1772,14 +1772,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/metadata@3.5.2-16, @polkadot/metadata@workspace:packages/metadata":
+"@polkadot/metadata@3.6.0, @polkadot/metadata@workspace:packages/metadata":
   version: 0.0.0-use.local
   resolution: "@polkadot/metadata@workspace:packages/metadata"
   dependencies:
     "@babel/runtime": ^7.12.5
     "@polkadot/keyring": ^5.4.2
-    "@polkadot/types": 3.5.2-16
-    "@polkadot/types-known": 3.5.2-16
+    "@polkadot/types": 3.6.0
+    "@polkadot/types-known": 3.6.0
     "@polkadot/util": ^5.4.2
     "@polkadot/util-crypto": ^5.4.2
     bn.js: ^4.11.9
@@ -1795,28 +1795,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/rpc-core@3.5.2-16, @polkadot/rpc-core@workspace:packages/rpc-core":
+"@polkadot/rpc-core@3.6.0, @polkadot/rpc-core@workspace:packages/rpc-core":
   version: 0.0.0-use.local
   resolution: "@polkadot/rpc-core@workspace:packages/rpc-core"
   dependencies:
     "@babel/runtime": ^7.12.5
     "@polkadot/keyring": ^5.4.2
-    "@polkadot/metadata": 3.5.2-16
-    "@polkadot/rpc-provider": 3.5.2-16
-    "@polkadot/types": 3.5.2-16
+    "@polkadot/metadata": 3.6.0
+    "@polkadot/rpc-provider": 3.6.0
+    "@polkadot/types": 3.6.0
     "@polkadot/util": ^5.4.2
     "@polkadot/x-rxjs": ^5.4.2
   languageName: unknown
   linkType: soft
 
-"@polkadot/rpc-provider@3.5.2-16, @polkadot/rpc-provider@workspace:packages/rpc-provider":
+"@polkadot/rpc-provider@3.6.0, @polkadot/rpc-provider@workspace:packages/rpc-provider":
   version: 0.0.0-use.local
   resolution: "@polkadot/rpc-provider@workspace:packages/rpc-provider"
   dependencies:
     "@babel/runtime": ^7.12.5
     "@polkadot/keyring": ^5.4.2
-    "@polkadot/metadata": 3.5.2-16
-    "@polkadot/types": 3.5.2-16
+    "@polkadot/metadata": 3.6.0
+    "@polkadot/types": 3.6.0
     "@polkadot/util": ^5.4.2
     "@polkadot/util-crypto": ^5.4.2
     "@polkadot/x-fetch": ^5.4.2
@@ -1844,10 +1844,10 @@ __metadata:
     "@babel/core": ^7.12.10
     "@babel/register": ^7.12.10
     "@babel/runtime": ^7.12.5
-    "@polkadot/api": 3.5.2-16
-    "@polkadot/metadata": 3.5.2-16
-    "@polkadot/rpc-provider": 3.5.2-16
-    "@polkadot/types": 3.5.2-16
+    "@polkadot/api": 3.6.0
+    "@polkadot/metadata": 3.6.0
+    "@polkadot/rpc-provider": 3.6.0
+    "@polkadot/types": 3.6.0
     "@polkadot/util": ^5.4.2
     "@types/websocket": ^1.0.1
     "@types/yargs": ^15.0.12
@@ -1863,25 +1863,25 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/types-known@3.5.2-16, @polkadot/types-known@workspace:packages/types-known":
+"@polkadot/types-known@3.6.0, @polkadot/types-known@workspace:packages/types-known":
   version: 0.0.0-use.local
   resolution: "@polkadot/types-known@workspace:packages/types-known"
   dependencies:
     "@babel/runtime": ^7.12.5
-    "@polkadot/types": 3.5.2-16
+    "@polkadot/types": 3.6.0
     "@polkadot/util": ^5.4.2
     "@types/bn.js": ^4.11.6
     bn.js: ^4.11.9
   languageName: unknown
   linkType: soft
 
-"@polkadot/types@3.5.2-16, @polkadot/types@workspace:packages/types":
+"@polkadot/types@3.6.0, @polkadot/types@workspace:packages/types":
   version: 0.0.0-use.local
   resolution: "@polkadot/types@workspace:packages/types"
   dependencies:
     "@babel/runtime": ^7.12.5
     "@polkadot/keyring": ^5.4.2
-    "@polkadot/metadata": 3.5.2-16
+    "@polkadot/metadata": 3.6.0
     "@polkadot/util": ^5.4.2
     "@polkadot/util-crypto": ^5.4.2
     "@polkadot/x-rxjs": ^5.4.2