diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fecdc24cf..1e9f3ad4e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@
 
 - Fix `ElectionSize` type (Thanks to https://github.com/arjanz)
 - Allow `BTreeSet` decoding from Array/JSON inputs
+- Adjust Call-only metadata output to trim documentation to first full line
+- Safeguard against divide-by-zero for total era points (expired reward eras)
+- Internal derive optimizations
 
 ## 1.16.1 May 26, 2020
 
diff --git a/packages/api-contract/package.json b/packages/api-contract/package.json
index 0b895da690..3e5b7078ad 100644
--- a/packages/api-contract/package.json
+++ b/packages/api-contract/package.json
@@ -30,7 +30,7 @@
     "@polkadot/api": "1.17.0-beta.6",
     "@polkadot/rpc-core": "1.17.0-beta.6",
     "@polkadot/types": "1.17.0-beta.6",
-    "@polkadot/util": "^2.11.1",
+    "@polkadot/util": "^2.12.2",
     "bn.js": "^5.1.2",
     "rxjs": "^6.5.5"
   }
diff --git a/packages/api-derive/package.json b/packages/api-derive/package.json
index 5d749b1eee..0edb4c1ae4 100644
--- a/packages/api-derive/package.json
+++ b/packages/api-derive/package.json
@@ -32,13 +32,13 @@
     "@polkadot/rpc-core": "1.17.0-beta.6",
     "@polkadot/rpc-provider": "1.17.0-beta.6",
     "@polkadot/types": "1.17.0-beta.6",
-    "@polkadot/util": "^2.11.1",
-    "@polkadot/util-crypto": "^2.11.1",
+    "@polkadot/util": "^2.12.2",
+    "@polkadot/util-crypto": "^2.12.2",
     "bn.js": "^5.1.2",
     "memoizee": "^0.4.14",
     "rxjs": "^6.5.5"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^2.11.1"
+    "@polkadot/keyring": "^2.12.2"
   }
 }
diff --git a/packages/api/package.json b/packages/api/package.json
index d94e342750..aec9691a49 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -28,19 +28,19 @@
   "dependencies": {
     "@babel/runtime": "^7.10.1",
     "@polkadot/api-derive": "1.17.0-beta.6",
-    "@polkadot/keyring": "^2.11.1",
+    "@polkadot/keyring": "^2.12.2",
     "@polkadot/metadata": "1.17.0-beta.6",
     "@polkadot/rpc-core": "1.17.0-beta.6",
     "@polkadot/rpc-provider": "1.17.0-beta.6",
     "@polkadot/types": "1.17.0-beta.6",
     "@polkadot/types-known": "1.17.0-beta.6",
-    "@polkadot/util": "^2.11.1",
-    "@polkadot/util-crypto": "^2.11.1",
+    "@polkadot/util": "^2.12.2",
+    "@polkadot/util-crypto": "^2.12.2",
     "bn.js": "^5.1.2",
     "eventemitter3": "^4.0.4",
     "rxjs": "^6.5.5"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^2.11.1"
+    "@polkadot/keyring": "^2.12.2"
   }
 }
diff --git a/packages/metadata/package.json b/packages/metadata/package.json
index 553711ad43..84102e4780 100644
--- a/packages/metadata/package.json
+++ b/packages/metadata/package.json
@@ -29,11 +29,11 @@
     "@babel/runtime": "^7.10.1",
     "@polkadot/types": "1.17.0-beta.6",
     "@polkadot/types-known": "1.17.0-beta.6",
-    "@polkadot/util": "^2.11.1",
-    "@polkadot/util-crypto": "^2.11.1",
+    "@polkadot/util": "^2.12.2",
+    "@polkadot/util-crypto": "^2.12.2",
     "bn.js": "^5.1.2"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^2.11.1"
+    "@polkadot/keyring": "^2.12.2"
   }
 }
diff --git a/packages/metadata/src/Metadata/util/toCallsOnly.ts b/packages/metadata/src/Metadata/util/toCallsOnly.ts
index 7c4a89079c..382c418c47 100644
--- a/packages/metadata/src/Metadata/util/toCallsOnly.ts
+++ b/packages/metadata/src/Metadata/util/toCallsOnly.ts
@@ -12,6 +12,15 @@ interface ModuleMetadataTrimmed {
   calls: Option<Vec<FunctionMetadataLatest>>;
 }
 
+function trimDocs (documentation: Vec<Text>): string[] {
+  const strings = documentation.map((doc) => doc.toString().trim());
+  const firstEmpty = strings.findIndex((doc) => !doc.length);
+
+  return firstEmpty === -1
+    ? strings
+    : strings.slice(0, firstEmpty);
+}
+
 function mapCalls (registry: Registry, _calls: Option<Vec<FunctionMetadataLatest>>): Option<Vec<FunctionMetadataLatest>> {
   const calls = _calls.unwrapOr(null);
 
@@ -21,7 +30,7 @@ function mapCalls (registry: Registry, _calls: Option<Vec<FunctionMetadataLatest
       ? calls.map(({ args, documentation, name }) =>
         registry.createType('FunctionMetadataLatest', {
           args,
-          documentation: documentation.map((doc) => doc.toString().trim()),
+          documentation: trimDocs(documentation),
           name
         })
       )
diff --git a/packages/rpc-core/package.json b/packages/rpc-core/package.json
index 5baef2a18c..53b3827a5d 100644
--- a/packages/rpc-core/package.json
+++ b/packages/rpc-core/package.json
@@ -30,11 +30,11 @@
     "@polkadot/metadata": "1.17.0-beta.6",
     "@polkadot/rpc-provider": "1.17.0-beta.6",
     "@polkadot/types": "1.17.0-beta.6",
-    "@polkadot/util": "^2.11.1",
+    "@polkadot/util": "^2.12.2",
     "memoizee": "^0.4.14",
     "rxjs": "^6.5.5"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^2.11.1"
+    "@polkadot/keyring": "^2.12.2"
   }
 }
diff --git a/packages/rpc-provider/package.json b/packages/rpc-provider/package.json
index c2034dc82e..21160dca63 100644
--- a/packages/rpc-provider/package.json
+++ b/packages/rpc-provider/package.json
@@ -29,15 +29,15 @@
     "@babel/runtime": "^7.10.1",
     "@polkadot/metadata": "1.17.0-beta.6",
     "@polkadot/types": "1.17.0-beta.6",
-    "@polkadot/util": "^2.11.1",
-    "@polkadot/util-crypto": "^2.11.1",
+    "@polkadot/util": "^2.12.2",
+    "@polkadot/util-crypto": "^2.12.2",
     "bn.js": "^5.1.2",
     "eventemitter3": "^4.0.4",
     "isomorphic-fetch": "^2.2.1",
     "websocket": "^1.0.31"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^2.11.1",
+    "@polkadot/keyring": "^2.12.2",
     "mock-socket": "^9.0.3",
     "nock": "^12.0.3"
   }
diff --git a/packages/typegen/package.json b/packages/typegen/package.json
index 3ae24b294a..3b5d9b74b9 100644
--- a/packages/typegen/package.json
+++ b/packages/typegen/package.json
@@ -40,7 +40,7 @@
     "@polkadot/metadata": "1.17.0-beta.6",
     "@polkadot/rpc-provider": "1.17.0-beta.6",
     "@polkadot/types": "1.17.0-beta.6",
-    "@polkadot/util": "^2.11.1",
+    "@polkadot/util": "^2.12.2",
     "handlebars": "^4.7.6",
     "websocket": "^1.0.31",
     "yargs": "^15.3.1"
diff --git a/packages/types-known/package.json b/packages/types-known/package.json
index b184628b05..9e6e1cecae 100644
--- a/packages/types-known/package.json
+++ b/packages/types-known/package.json
@@ -28,7 +28,7 @@
   "dependencies": {
     "@babel/runtime": "^7.10.1",
     "@polkadot/types": "1.17.0-beta.6",
-    "@polkadot/util": "^2.11.1",
+    "@polkadot/util": "^2.12.2",
     "bn.js": "^5.1.2"
   },
   "devDependencies": {
diff --git a/packages/types/package.json b/packages/types/package.json
index e110bafc24..8037eed742 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -28,15 +28,15 @@
   "dependencies": {
     "@babel/runtime": "^7.10.1",
     "@polkadot/metadata": "1.17.0-beta.6",
-    "@polkadot/util": "^2.11.1",
-    "@polkadot/util-crypto": "^2.11.1",
+    "@polkadot/util": "^2.12.2",
+    "@polkadot/util-crypto": "^2.12.2",
     "@types/bn.js": "^4.11.6",
     "bn.js": "^5.1.2",
     "memoizee": "^0.4.14",
     "rxjs": "^6.5.5"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^2.11.1",
+    "@polkadot/keyring": "^2.12.2",
     "@types/memoizee": "^0.4.4"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 4457b996b5..35aa4468ec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2672,7 +2672,7 @@ __metadata:
     "@polkadot/api": 1.17.0-beta.6
     "@polkadot/rpc-core": 1.17.0-beta.6
     "@polkadot/types": 1.17.0-beta.6
-    "@polkadot/util": ^2.11.1
+    "@polkadot/util": ^2.12.2
     bn.js: ^5.1.2
     rxjs: ^6.5.5
   languageName: unknown
@@ -2684,12 +2684,12 @@ __metadata:
   dependencies:
     "@babel/runtime": ^7.10.1
     "@polkadot/api": 1.17.0-beta.6
-    "@polkadot/keyring": ^2.11.1
+    "@polkadot/keyring": ^2.12.2
     "@polkadot/rpc-core": 1.17.0-beta.6
     "@polkadot/rpc-provider": 1.17.0-beta.6
     "@polkadot/types": 1.17.0-beta.6
-    "@polkadot/util": ^2.11.1
-    "@polkadot/util-crypto": ^2.11.1
+    "@polkadot/util": ^2.12.2
+    "@polkadot/util-crypto": ^2.12.2
     bn.js: ^5.1.2
     memoizee: ^0.4.14
     rxjs: ^6.5.5
@@ -2702,14 +2702,14 @@ __metadata:
   dependencies:
     "@babel/runtime": ^7.10.1
     "@polkadot/api-derive": 1.17.0-beta.6
-    "@polkadot/keyring": ^2.11.1
+    "@polkadot/keyring": ^2.12.2
     "@polkadot/metadata": 1.17.0-beta.6
     "@polkadot/rpc-core": 1.17.0-beta.6
     "@polkadot/rpc-provider": 1.17.0-beta.6
     "@polkadot/types": 1.17.0-beta.6
     "@polkadot/types-known": 1.17.0-beta.6
-    "@polkadot/util": ^2.11.1
-    "@polkadot/util-crypto": ^2.11.1
+    "@polkadot/util": ^2.12.2
+    "@polkadot/util-crypto": ^2.12.2
     bn.js: ^5.1.2
     eventemitter3: ^4.0.4
     rxjs: ^6.5.5
@@ -2805,14 +2805,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polkadot/keyring@npm:^2.11.1":
-  version: 2.11.1
-  resolution: "@polkadot/keyring@npm:2.11.1"
+"@polkadot/keyring@npm:^2.12.2":
+  version: 2.12.2
+  resolution: "@polkadot/keyring@npm:2.12.2"
   dependencies:
     "@babel/runtime": ^7.9.6
-    "@polkadot/util": 2.11.1
-    "@polkadot/util-crypto": 2.11.1
-  checksum: 3/31a9bf50ea3d3dc64de629439fe3f75d0d7fa61e3334acbd7cceda61248947e980728836836695c7ce7fbd973752e4c6d1a5c9f1f27bdd899997e19911e819f3
+    "@polkadot/util": 2.12.2
+    "@polkadot/util-crypto": 2.12.2
+  checksum: 3/392100b1f0b1939f65aefa34a9b532d989fa585a1c04b72088ed382ef0c5d853622bb4138924fb477230a157a443c0ad1ed29910e65ee063bc54d9e37fe3438d
   languageName: node
   linkType: hard
 
@@ -2821,11 +2821,11 @@ __metadata:
   resolution: "@polkadot/metadata@workspace:packages/metadata"
   dependencies:
     "@babel/runtime": ^7.10.1
-    "@polkadot/keyring": ^2.11.1
+    "@polkadot/keyring": ^2.12.2
     "@polkadot/types": 1.17.0-beta.6
     "@polkadot/types-known": 1.17.0-beta.6
-    "@polkadot/util": ^2.11.1
-    "@polkadot/util-crypto": ^2.11.1
+    "@polkadot/util": ^2.12.2
+    "@polkadot/util-crypto": ^2.12.2
     bn.js: ^5.1.2
   languageName: unknown
   linkType: soft
@@ -2835,11 +2835,11 @@ __metadata:
   resolution: "@polkadot/rpc-core@workspace:packages/rpc-core"
   dependencies:
     "@babel/runtime": ^7.10.1
-    "@polkadot/keyring": ^2.11.1
+    "@polkadot/keyring": ^2.12.2
     "@polkadot/metadata": 1.17.0-beta.6
     "@polkadot/rpc-provider": 1.17.0-beta.6
     "@polkadot/types": 1.17.0-beta.6
-    "@polkadot/util": ^2.11.1
+    "@polkadot/util": ^2.12.2
     memoizee: ^0.4.14
     rxjs: ^6.5.5
   languageName: unknown
@@ -2850,11 +2850,11 @@ __metadata:
   resolution: "@polkadot/rpc-provider@workspace:packages/rpc-provider"
   dependencies:
     "@babel/runtime": ^7.10.1
-    "@polkadot/keyring": ^2.11.1
+    "@polkadot/keyring": ^2.12.2
     "@polkadot/metadata": 1.17.0-beta.6
     "@polkadot/types": 1.17.0-beta.6
-    "@polkadot/util": ^2.11.1
-    "@polkadot/util-crypto": ^2.11.1
+    "@polkadot/util": ^2.12.2
+    "@polkadot/util-crypto": ^2.12.2
     bn.js: ^5.1.2
     eventemitter3: ^4.0.4
     isomorphic-fetch: ^2.2.1
@@ -2884,7 +2884,7 @@ __metadata:
     "@polkadot/metadata": 1.17.0-beta.6
     "@polkadot/rpc-provider": 1.17.0-beta.6
     "@polkadot/types": 1.17.0-beta.6
-    "@polkadot/util": ^2.11.1
+    "@polkadot/util": ^2.12.2
     "@types/websocket": ^1.0.0
     "@types/yargs": ^15.0.5
     handlebars: ^4.7.6
@@ -2905,7 +2905,7 @@ __metadata:
   dependencies:
     "@babel/runtime": ^7.10.1
     "@polkadot/types": 1.17.0-beta.6
-    "@polkadot/util": ^2.11.1
+    "@polkadot/util": ^2.12.2
     "@types/bn.js": ^4.11.6
     bn.js: ^5.1.2
   languageName: unknown
@@ -2916,10 +2916,10 @@ __metadata:
   resolution: "@polkadot/types@workspace:packages/types"
   dependencies:
     "@babel/runtime": ^7.10.1
-    "@polkadot/keyring": ^2.11.1
+    "@polkadot/keyring": ^2.12.2
     "@polkadot/metadata": 1.17.0-beta.6
-    "@polkadot/util": ^2.11.1
-    "@polkadot/util-crypto": ^2.11.1
+    "@polkadot/util": ^2.12.2
+    "@polkadot/util-crypto": ^2.12.2
     "@types/bn.js": ^4.11.6
     "@types/memoizee": ^0.4.4
     bn.js: ^5.1.2
@@ -2928,12 +2928,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@polkadot/util-crypto@npm:2.11.1, @polkadot/util-crypto@npm:^2.11.1":
-  version: 2.11.1
-  resolution: "@polkadot/util-crypto@npm:2.11.1"
+"@polkadot/util-crypto@npm:2.12.2, @polkadot/util-crypto@npm:^2.12.2":
+  version: 2.12.2
+  resolution: "@polkadot/util-crypto@npm:2.12.2"
   dependencies:
     "@babel/runtime": ^7.9.6
-    "@polkadot/util": 2.11.1
+    "@polkadot/util": 2.12.2
     "@polkadot/wasm-crypto": ^1.2.1
     base-x: ^3.0.8
     bip39: ^3.0.2
@@ -2945,13 +2945,13 @@ __metadata:
     pbkdf2: ^3.0.17
     tweetnacl: ^1.0.3
     xxhashjs: ^0.2.2
-  checksum: 3/b91c8d5a7cd5f5b98927880035cc3ed8004e0243bbae75cd87209bb9c0bd153268ddb75a24daddf79ad3bd29fc4bc7b2ce36e1be17f923ccdefdf63990131397
+  checksum: 3/f945da48556bf2af32c0eb5e67c2c5a0b5737cdbfa00c0c08a1bbce34770ec68e2736d9bdc35e68dc2f4617c906db6472efaedf9b3ceaaf2a59d1558a400ba34
   languageName: node
   linkType: hard
 
-"@polkadot/util@npm:2.11.1, @polkadot/util@npm:^2.11.1":
-  version: 2.11.1
-  resolution: "@polkadot/util@npm:2.11.1"
+"@polkadot/util@npm:2.12.2, @polkadot/util@npm:^2.12.2":
+  version: 2.12.2
+  resolution: "@polkadot/util@npm:2.12.2"
   dependencies:
     "@babel/runtime": ^7.9.6
     "@types/bn.js": ^4.11.6
@@ -2959,7 +2959,7 @@ __metadata:
     camelcase: ^5.3.1
     chalk: ^4.0.0
     ip-regex: ^4.1.0
-  checksum: 3/93659e39722a75004011074413c8c71be94df8cf4294275ee9ee90e9ddc66f110f89170ba4daa53f18f92c25f66ccd57bf36d78f123b8fa73cd3792fc5dfaa4f
+  checksum: 3/23c93c4a1ba611012d4d301f6c32cfbd891a1c1dcfea06c5f83273bab6587e5b2a091b6acf91d18a4806bd50a5e05e1c7b003642011573d14324a1da0454a300
   languageName: node
   linkType: hard