diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e52e8953c..25555cce6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,27 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [5.0.0-pre.21](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.20...v5.0.0-pre.21) (2022-05-23)
+
+
+### Bug Fixes
+
+* **authentication-oauth:** Fix regression using incorrect callback and redirect_uri ([#2631](https://github.com/feathersjs/feathers/issues/2631)) ([43d8a08](https://github.com/feathersjs/feathers/commit/43d8a082d7e1807f8a431c44a1dbd9b04c3af0d2))
+* **core:** Do not throw missing method error for regular hook methods ([#2636](https://github.com/feathersjs/feathers/issues/2636)) ([afe9a3b](https://github.com/feathersjs/feathers/commit/afe9a3b3d49897eff045ee237ca2937a6b975291))
+* **schema:** Add Combine helper to allow merging schema types that use ([#2637](https://github.com/feathersjs/feathers/issues/2637)) ([06d03e9](https://github.com/feathersjs/feathers/commit/06d03e91abb1347576c2351c12322d01c58473e5))
+* **typescript:** Make additional types generic to work with extended types ([#2625](https://github.com/feathersjs/feathers/issues/2625)) ([269fdec](https://github.com/feathersjs/feathers/commit/269fdecc5961092dc8608b3cbe16f433c80bfa96))
+
+
+### Features
+
+* **schema:** Add resolveAll hook ([#2643](https://github.com/feathersjs/feathers/issues/2643)) ([85527d7](https://github.com/feathersjs/feathers/commit/85527d71cb78852880696e5d96abdcdf24593934))
+* **schema:** Add resolver for safe external data dispatching ([#2641](https://github.com/feathersjs/feathers/issues/2641)) ([72b980e](https://github.com/feathersjs/feathers/commit/72b980e05631136d30c8f1468dee45ec6a8d2503))
+* **schema:** Add schema resolver converter functionality ([#2640](https://github.com/feathersjs/feathers/issues/2640)) ([26d9e05](https://github.com/feathersjs/feathers/commit/26d9e05327d6e0144466cd57d6fcc11ac7ecb06a))
+
+
+
+
+
 # [5.0.0-pre.20](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.19...v5.0.0-pre.20) (2022-05-04)
 
 
diff --git a/lerna.json b/lerna.json
index d970b09587..36271228d7 100644
--- a/lerna.json
+++ b/lerna.json
@@ -3,7 +3,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "5.0.0-pre.20",
+  "version": "5.0.0-pre.21",
   "command": {
     "bootstrap": {
       "hoist": true
diff --git a/packages/adapter-commons/CHANGELOG.md b/packages/adapter-commons/CHANGELOG.md
index 4674bef2d8..b7eede1f3e 100644
--- a/packages/adapter-commons/CHANGELOG.md
+++ b/packages/adapter-commons/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.
 
+# [5.0.0-pre.21](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.20...v5.0.0-pre.21) (2022-05-23)
+
+**Note:** Version bump only for package @feathersjs/adapter-commons
+
+
+
+
+
 # [5.0.0-pre.20](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.19...v5.0.0-pre.20) (2022-05-04)
 
 
diff --git a/packages/adapter-commons/package.json b/packages/adapter-commons/package.json
index 7348efa10e..6943cde540 100644
--- a/packages/adapter-commons/package.json
+++ b/packages/adapter-commons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@feathersjs/adapter-commons",
-  "version": "5.0.0-pre.20",
+  "version": "5.0.0-pre.21",
   "description": "Shared database adapter utility functions",
   "homepage": "https://feathersjs.com",
   "keywords": [
@@ -50,8 +50,8 @@
   },
   "dependencies": {
     "@feathersjs/commons": "^5.0.0-pre.20",
-    "@feathersjs/errors": "^5.0.0-pre.20",
-    "@feathersjs/feathers": "^5.0.0-pre.20"
+    "@feathersjs/errors": "^5.0.0-pre.21",
+    "@feathersjs/feathers": "^5.0.0-pre.21"
   },
   "devDependencies": {
     "@types/mocha": "^9.1.1",
diff --git a/packages/authentication-client/CHANGELOG.md b/packages/authentication-client/CHANGELOG.md
index b0a82f0bf5..73a7fcc95d 100644
--- a/packages/authentication-client/CHANGELOG.md
+++ b/packages/authentication-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.
 
+# [5.0.0-pre.21](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.20...v5.0.0-pre.21) (2022-05-23)
+
+**Note:** Version bump only for package @feathersjs/authentication-client
+
+
+
+
+
 # [5.0.0-pre.20](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.19...v5.0.0-pre.20) (2022-05-04)
 
 
diff --git a/packages/authentication-client/package.json b/packages/authentication-client/package.json
index 474d02e26c..181887db3b 100644
--- a/packages/authentication-client/package.json
+++ b/packages/authentication-client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/authentication-client",
   "description": "The authentication plugin for feathers-client",
-  "version": "5.0.0-pre.20",
+  "version": "5.0.0-pre.21",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "types": "lib/",
@@ -52,18 +52,18 @@
     "access": "public"
   },
   "dependencies": {
-    "@feathersjs/authentication": "^5.0.0-pre.20",
+    "@feathersjs/authentication": "^5.0.0-pre.21",
     "@feathersjs/commons": "^5.0.0-pre.20",
-    "@feathersjs/errors": "^5.0.0-pre.20",
-    "@feathersjs/feathers": "^5.0.0-pre.20"
+    "@feathersjs/errors": "^5.0.0-pre.21",
+    "@feathersjs/feathers": "^5.0.0-pre.21"
   },
   "devDependencies": {
-    "@feathersjs/authentication-local": "^5.0.0-pre.20",
-    "@feathersjs/express": "^5.0.0-pre.20",
-    "@feathersjs/memory": "^5.0.0-pre.20",
-    "@feathersjs/rest-client": "^5.0.0-pre.20",
-    "@feathersjs/socketio": "^5.0.0-pre.20",
-    "@feathersjs/socketio-client": "^5.0.0-pre.20",
+    "@feathersjs/authentication-local": "^5.0.0-pre.21",
+    "@feathersjs/express": "^5.0.0-pre.21",
+    "@feathersjs/memory": "^5.0.0-pre.21",
+    "@feathersjs/rest-client": "^5.0.0-pre.21",
+    "@feathersjs/socketio": "^5.0.0-pre.21",
+    "@feathersjs/socketio-client": "^5.0.0-pre.21",
     "@types/mocha": "^9.1.1",
     "@types/node": "^17.0.31",
     "axios": "^0.27.2",
diff --git a/packages/authentication-local/CHANGELOG.md b/packages/authentication-local/CHANGELOG.md
index 576c1d5457..9575bda997 100644
--- a/packages/authentication-local/CHANGELOG.md
+++ b/packages/authentication-local/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.
 
+# [5.0.0-pre.21](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.20...v5.0.0-pre.21) (2022-05-23)
+
+**Note:** Version bump only for package @feathersjs/authentication-local
+
+
+
+
+
 # [5.0.0-pre.20](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.19...v5.0.0-pre.20) (2022-05-04)
 
 
diff --git a/packages/authentication-local/package.json b/packages/authentication-local/package.json
index 125bc87232..2a0801fa87 100644
--- a/packages/authentication-local/package.json
+++ b/packages/authentication-local/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/authentication-local",
   "description": "Local authentication strategy for @feathers/authentication",
-  "version": "5.0.0-pre.20",
+  "version": "5.0.0-pre.21",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "types": "lib/",
@@ -52,15 +52,15 @@
     "access": "public"
   },
   "dependencies": {
-    "@feathersjs/authentication": "^5.0.0-pre.20",
+    "@feathersjs/authentication": "^5.0.0-pre.21",
     "@feathersjs/commons": "^5.0.0-pre.20",
-    "@feathersjs/errors": "^5.0.0-pre.20",
-    "@feathersjs/feathers": "^5.0.0-pre.20",
+    "@feathersjs/errors": "^5.0.0-pre.21",
+    "@feathersjs/feathers": "^5.0.0-pre.21",
     "bcryptjs": "^2.4.3",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@feathersjs/memory": "^5.0.0-pre.20",
+    "@feathersjs/memory": "^5.0.0-pre.21",
     "@types/bcryptjs": "^2.4.2",
     "@types/lodash": "^4.14.182",
     "@types/mocha": "^9.1.1",
diff --git a/packages/authentication-oauth/CHANGELOG.md b/packages/authentication-oauth/CHANGELOG.md
index 699291b268..a8eca6e82e 100644
--- a/packages/authentication-oauth/CHANGELOG.md
+++ b/packages/authentication-oauth/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.
 
+# [5.0.0-pre.21](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.20...v5.0.0-pre.21) (2022-05-23)
+
+
+### Bug Fixes
+
+* **authentication-oauth:** Fix regression using incorrect callback and redirect_uri ([#2631](https://github.com/feathersjs/feathers/issues/2631)) ([43d8a08](https://github.com/feathersjs/feathers/commit/43d8a082d7e1807f8a431c44a1dbd9b04c3af0d2))
+
+
+
+
+
 # [5.0.0-pre.20](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.19...v5.0.0-pre.20) (2022-05-04)
 
 
diff --git a/packages/authentication-oauth/package.json b/packages/authentication-oauth/package.json
index 776102c566..f65171bb66 100644
--- a/packages/authentication-oauth/package.json
+++ b/packages/authentication-oauth/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/authentication-oauth",
   "description": "oAuth 1 and 2 authentication for Feathers. Powered by Grant.",
-  "version": "5.0.0-pre.20",
+  "version": "5.0.0-pre.21",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "types": "lib/",
@@ -53,17 +53,17 @@
     "access": "public"
   },
   "dependencies": {
-    "@feathersjs/authentication": "^5.0.0-pre.20",
+    "@feathersjs/authentication": "^5.0.0-pre.21",
     "@feathersjs/commons": "^5.0.0-pre.20",
-    "@feathersjs/errors": "^5.0.0-pre.20",
-    "@feathersjs/express": "^5.0.0-pre.20",
-    "@feathersjs/feathers": "^5.0.0-pre.20",
+    "@feathersjs/errors": "^5.0.0-pre.21",
+    "@feathersjs/express": "^5.0.0-pre.21",
+    "@feathersjs/feathers": "^5.0.0-pre.21",
     "express-session": "^1.17.2",
     "grant": "^5.4.21",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@feathersjs/memory": "^5.0.0-pre.20",
+    "@feathersjs/memory": "^5.0.0-pre.21",
     "@types/express": "^4.17.13",
     "@types/express-session": "^1.17.4",
     "@types/lodash": "^4.14.182",
diff --git a/packages/authentication/CHANGELOG.md b/packages/authentication/CHANGELOG.md
index 5f9943d8a4..3fa5fbea08 100644
--- a/packages/authentication/CHANGELOG.md
+++ b/packages/authentication/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.
 
+# [5.0.0-pre.21](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.20...v5.0.0-pre.21) (2022-05-23)
+
+**Note:** Version bump only for package @feathersjs/authentication
+
+
+
+
+
 # [5.0.0-pre.20](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.19...v5.0.0-pre.20) (2022-05-04)
 
 
diff --git a/packages/authentication/package.json b/packages/authentication/package.json
index 173bcb6dcd..c2d99fd6b8 100644
--- a/packages/authentication/package.json
+++ b/packages/authentication/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/authentication",
   "description": "Add Authentication to your FeathersJS app.",
-  "version": "5.0.0-pre.20",
+  "version": "5.0.0-pre.21",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "types": "lib/",
@@ -53,9 +53,9 @@
   },
   "dependencies": {
     "@feathersjs/commons": "^5.0.0-pre.20",
-    "@feathersjs/errors": "^5.0.0-pre.20",
-    "@feathersjs/feathers": "^5.0.0-pre.20",
-    "@feathersjs/transport-commons": "^5.0.0-pre.20",
+    "@feathersjs/errors": "^5.0.0-pre.21",
+    "@feathersjs/feathers": "^5.0.0-pre.21",
+    "@feathersjs/transport-commons": "^5.0.0-pre.21",
     "@types/jsonwebtoken": "^8.5.8",
     "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.21",
@@ -63,8 +63,8 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@feathersjs/memory": "^5.0.0-pre.20",
-    "@feathersjs/schema": "^5.0.0-pre.20",
+    "@feathersjs/memory": "^5.0.0-pre.21",
+    "@feathersjs/schema": "^5.0.0-pre.21",
     "@types/lodash": "^4.14.182",
     "@types/mocha": "^9.1.1",
     "@types/node": "^17.0.31",
diff --git a/packages/client/CHANGELOG.md b/packages/client/CHANGELOG.md
index db50c16b7d..6049ad2e24 100644
--- a/packages/client/CHANGELOG.md
+++ b/packages/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.
 
+# [5.0.0-pre.21](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.20...v5.0.0-pre.21) (2022-05-23)
+
+**Note:** Version bump only for package @feathersjs/client
+
+
+
+
+
 # [5.0.0-pre.20](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.19...v5.0.0-pre.20) (2022-05-04)
 
 
diff --git a/packages/client/package.json b/packages/client/package.json
index 605a22b0e6..bcd50df9e4 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/client",
   "description": "A module that consolidates Feathers client modules for REST (jQuery, Request, Superagent) and Websocket (Socket.io, Primus) connections",
-  "version": "5.0.0-pre.20",
+  "version": "5.0.0-pre.21",
   "repository": {
     "type": "git",
     "url": "https://github.com/feathersjs/feathers.git",
@@ -49,19 +49,19 @@
     "IE 11"
   ],
   "dependencies": {
-    "@feathersjs/authentication-client": "^5.0.0-pre.20",
-    "@feathersjs/errors": "^5.0.0-pre.20",
-    "@feathersjs/feathers": "^5.0.0-pre.20",
-    "@feathersjs/rest-client": "^5.0.0-pre.20",
-    "@feathersjs/socketio-client": "^5.0.0-pre.20"
+    "@feathersjs/authentication-client": "^5.0.0-pre.21",
+    "@feathersjs/errors": "^5.0.0-pre.21",
+    "@feathersjs/feathers": "^5.0.0-pre.21",
+    "@feathersjs/rest-client": "^5.0.0-pre.21",
+    "@feathersjs/socketio-client": "^5.0.0-pre.21"
   },
   "devDependencies": {
     "@babel/core": "^7.17.10",
     "@babel/preset-env": "^7.17.10",
-    "@feathersjs/express": "^5.0.0-pre.20",
-    "@feathersjs/memory": "^5.0.0-pre.20",
-    "@feathersjs/socketio": "^5.0.0-pre.20",
-    "@feathersjs/tests": "^5.0.0-pre.20",
+    "@feathersjs/express": "^5.0.0-pre.21",
+    "@feathersjs/memory": "^5.0.0-pre.21",
+    "@feathersjs/socketio": "^5.0.0-pre.21",
+    "@feathersjs/tests": "^5.0.0-pre.21",
     "babel-loader": "^8.2.5",
     "mocha": "^10.0.0",
     "mocha-puppeteer": "^0.14.0",
diff --git a/packages/configuration/CHANGELOG.md b/packages/configuration/CHANGELOG.md
index c88424872d..b1cf7e0cb2 100644
--- a/packages/configuration/CHANGELOG.md
+++ b/packages/configuration/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.
 
+# [5.0.0-pre.21](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.20...v5.0.0-pre.21) (2022-05-23)
+
+**Note:** Version bump only for package @feathersjs/configuration
+
+
+
+
+
 # [5.0.0-pre.20](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.19...v5.0.0-pre.20) (2022-05-04)
 
 
diff --git a/packages/configuration/package.json b/packages/configuration/package.json
index fd66f940ac..8c008174db 100644
--- a/packages/configuration/package.json
+++ b/packages/configuration/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/configuration",
   "description": "A small configuration module for your Feathers application.",
-  "version": "5.0.0-pre.20",
+  "version": "5.0.0-pre.21",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "types": "lib/",
@@ -58,8 +58,8 @@
   },
   "dependencies": {
     "@feathersjs/commons": "^5.0.0-pre.20",
-    "@feathersjs/feathers": "^5.0.0-pre.20",
-    "@feathersjs/schema": "^5.0.0-pre.20",
+    "@feathersjs/feathers": "^5.0.0-pre.21",
+    "@feathersjs/schema": "^5.0.0-pre.21",
     "@types/config": "^0.0.41",
     "config": "^3.3.7"
   },
diff --git a/packages/errors/CHANGELOG.md b/packages/errors/CHANGELOG.md
index 8ebfefd5bb..312eab3c56 100644
--- a/packages/errors/CHANGELOG.md
+++ b/packages/errors/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.
 
+# [5.0.0-pre.21](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.20...v5.0.0-pre.21) (2022-05-23)
+
+**Note:** Version bump only for package @feathersjs/errors
+
+
+
+
+
 # [5.0.0-pre.20](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.19...v5.0.0-pre.20) (2022-05-04)
 
 
diff --git a/packages/errors/package.json b/packages/errors/package.json
index 616fb6425c..1f1478ed13 100644
--- a/packages/errors/package.json
+++ b/packages/errors/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/errors",
   "description": "Common error types for Feathers apps",
-  "version": "5.0.0-pre.20",
+  "version": "5.0.0-pre.21",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "types": "lib/",
@@ -48,7 +48,7 @@
     "*.js"
   ],
   "devDependencies": {
-    "@feathersjs/feathers": "^5.0.0-pre.20",
+    "@feathersjs/feathers": "^5.0.0-pre.21",
     "@types/mocha": "^9.1.1",
     "@types/node": "^17.0.31",
     "mocha": "^10.0.0",
diff --git a/packages/express/CHANGELOG.md b/packages/express/CHANGELOG.md
index 9368d6663d..c577e559cc 100644
--- a/packages/express/CHANGELOG.md
+++ b/packages/express/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.
 
+# [5.0.0-pre.21](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.20...v5.0.0-pre.21) (2022-05-23)
+
+**Note:** Version bump only for package @feathersjs/express
+
+
+
+
+
 # [5.0.0-pre.20](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.19...v5.0.0-pre.20) (2022-05-04)
 
 
diff --git a/packages/express/package.json b/packages/express/package.json
index 9bcc8eab3e..a74faaa78b 100644
--- a/packages/express/package.json
+++ b/packages/express/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/express",
   "description": "Feathers Express framework bindings and REST provider",
-  "version": "5.0.0-pre.20",
+  "version": "5.0.0-pre.21",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "types": "lib/",
@@ -51,18 +51,18 @@
     "access": "public"
   },
   "dependencies": {
-    "@feathersjs/authentication": "^5.0.0-pre.20",
+    "@feathersjs/authentication": "^5.0.0-pre.21",
     "@feathersjs/commons": "^5.0.0-pre.20",
-    "@feathersjs/errors": "^5.0.0-pre.20",
-    "@feathersjs/feathers": "^5.0.0-pre.20",
-    "@feathersjs/transport-commons": "^5.0.0-pre.20",
+    "@feathersjs/errors": "^5.0.0-pre.21",
+    "@feathersjs/feathers": "^5.0.0-pre.21",
+    "@feathersjs/transport-commons": "^5.0.0-pre.21",
     "@types/express": "^4.17.13",
     "@types/express-serve-static-core": "^4.17.28",
     "express": "^4.18.1"
   },
   "devDependencies": {
-    "@feathersjs/authentication-local": "^5.0.0-pre.20",
-    "@feathersjs/tests": "^5.0.0-pre.20",
+    "@feathersjs/authentication-local": "^5.0.0-pre.21",
+    "@feathersjs/tests": "^5.0.0-pre.21",
     "@types/lodash": "^4.14.182",
     "@types/mocha": "^9.1.1",
     "@types/node": "^17.0.31",
diff --git a/packages/feathers/CHANGELOG.md b/packages/feathers/CHANGELOG.md
index a11a5dd31e..9f113015c3 100644
--- a/packages/feathers/CHANGELOG.md
+++ b/packages/feathers/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.
 
+# [5.0.0-pre.21](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.20...v5.0.0-pre.21) (2022-05-23)
+
+
+### Bug Fixes
+
+* **core:** Do not throw missing method error for regular hook methods ([#2636](https://github.com/feathersjs/feathers/issues/2636)) ([afe9a3b](https://github.com/feathersjs/feathers/commit/afe9a3b3d49897eff045ee237ca2937a6b975291))
+
+
+
+
+
 # [5.0.0-pre.20](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.19...v5.0.0-pre.20) (2022-05-04)
 
 
diff --git a/packages/feathers/package.json b/packages/feathers/package.json
index 188b830ee8..4dcffca504 100644
--- a/packages/feathers/package.json
+++ b/packages/feathers/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/feathers",
   "description": "A framework for real-time applications and REST API with JavaScript and TypeScript",
-  "version": "5.0.0-pre.20",
+  "version": "5.0.0-pre.21",
   "homepage": "http://feathersjs.com",
   "repository": {
     "type": "git",
diff --git a/packages/koa/CHANGELOG.md b/packages/koa/CHANGELOG.md
index 1a706fd1ed..4eb4634f5c 100644
--- a/packages/koa/CHANGELOG.md
+++ b/packages/koa/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.
 
+# [5.0.0-pre.21](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.20...v5.0.0-pre.21) (2022-05-23)
+
+**Note:** Version bump only for package @feathersjs/koa
+
+
+
+
+
 # [5.0.0-pre.20](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.19...v5.0.0-pre.20) (2022-05-04)
 
 
diff --git a/packages/koa/package.json b/packages/koa/package.json
index 1d0df0eada..93e8a41bfb 100644
--- a/packages/koa/package.json
+++ b/packages/koa/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/koa",
   "description": "Feathers KoaJS framework bindings and REST provider",
-  "version": "5.0.0-pre.20",
+  "version": "5.0.0-pre.21",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "types": "lib/",
@@ -48,10 +48,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@feathersjs/authentication": "^5.0.0-pre.20",
+    "@feathersjs/authentication": "^5.0.0-pre.21",
     "@feathersjs/commons": "^5.0.0-pre.20",
-    "@feathersjs/errors": "^5.0.0-pre.20",
-    "@feathersjs/transport-commons": "^5.0.0-pre.20",
+    "@feathersjs/errors": "^5.0.0-pre.21",
+    "@feathersjs/transport-commons": "^5.0.0-pre.21",
     "@types/koa": "^2.13.4",
     "@types/koa-bodyparser": "^4.3.7",
     "@types/koa-qs": "^2.0.0",
@@ -61,10 +61,10 @@
     "koa-qs": "^3.0.0"
   },
   "devDependencies": {
-    "@feathersjs/authentication-local": "^5.0.0-pre.20",
-    "@feathersjs/feathers": "^5.0.0-pre.20",
-    "@feathersjs/memory": "^5.0.0-pre.20",
-    "@feathersjs/tests": "^5.0.0-pre.20",
+    "@feathersjs/authentication-local": "^5.0.0-pre.21",
+    "@feathersjs/feathers": "^5.0.0-pre.21",
+    "@feathersjs/memory": "^5.0.0-pre.21",
+    "@feathersjs/tests": "^5.0.0-pre.21",
     "@types/koa-compose": "^3.2.5",
     "@types/mocha": "^9.1.1",
     "@types/node": "^17.0.31",
diff --git a/packages/memory/CHANGELOG.md b/packages/memory/CHANGELOG.md
index 2830aa9911..c15cdaba1f 100644
--- a/packages/memory/CHANGELOG.md
+++ b/packages/memory/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.
 
+# [5.0.0-pre.21](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.20...v5.0.0-pre.21) (2022-05-23)
+
+**Note:** Version bump only for package @feathersjs/memory
+
+
+
+
+
 # [5.0.0-pre.20](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.19...v5.0.0-pre.20) (2022-05-04)
 
 
diff --git a/packages/memory/package.json b/packages/memory/package.json
index a2d33b18b3..acdf9bf016 100644
--- a/packages/memory/package.json
+++ b/packages/memory/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/memory",
   "description": "An in memory service store",
-  "version": "5.0.0-pre.20",
+  "version": "5.0.0-pre.21",
   "homepage": "https://github.com/feathersjs/feathers",
   "main": "lib/",
   "types": "lib/",
@@ -47,14 +47,14 @@
     "lib": "lib"
   },
   "dependencies": {
-    "@feathersjs/adapter-commons": "^5.0.0-pre.20",
+    "@feathersjs/adapter-commons": "^5.0.0-pre.21",
     "@feathersjs/commons": "^5.0.0-pre.20",
-    "@feathersjs/errors": "^5.0.0-pre.20",
+    "@feathersjs/errors": "^5.0.0-pre.21",
     "sift": "^16.0.0"
   },
   "devDependencies": {
     "@feathersjs/adapter-tests": "^5.0.0-pre.20",
-    "@feathersjs/feathers": "^5.0.0-pre.20",
+    "@feathersjs/feathers": "^5.0.0-pre.21",
     "@types/mocha": "^9.1.1",
     "@types/node": "^17.0.31",
     "mocha": "^10.0.0",
diff --git a/packages/mongodb/CHANGELOG.md b/packages/mongodb/CHANGELOG.md
index 6435405ec8..7971513ba6 100644
--- a/packages/mongodb/CHANGELOG.md
+++ b/packages/mongodb/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.
 
+# [5.0.0-pre.21](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.20...v5.0.0-pre.21) (2022-05-23)
+
+
+### Bug Fixes
+
+* **typescript:** Make additional types generic to work with extended types ([#2625](https://github.com/feathersjs/feathers/issues/2625)) ([269fdec](https://github.com/feathersjs/feathers/commit/269fdecc5961092dc8608b3cbe16f433c80bfa96))
+
+
+
+
+
 # [5.0.0-pre.20](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.19...v5.0.0-pre.20) (2022-05-04)
 
 
diff --git a/packages/mongodb/package.json b/packages/mongodb/package.json
index 37e5c41950..dc26486229 100644
--- a/packages/mongodb/package.json
+++ b/packages/mongodb/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/mongodb",
   "description": "Feathers MongoDB service adapter",
-  "version": "5.0.0-pre.20",
+  "version": "5.0.0-pre.21",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "keywords": [
@@ -50,10 +50,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@feathersjs/adapter-commons": "^5.0.0-pre.20",
+    "@feathersjs/adapter-commons": "^5.0.0-pre.21",
     "@feathersjs/commons": "^5.0.0-pre.20",
-    "@feathersjs/errors": "^5.0.0-pre.20",
-    "@feathersjs/feathers": "^5.0.0-pre.20"
+    "@feathersjs/errors": "^5.0.0-pre.21",
+    "@feathersjs/feathers": "^5.0.0-pre.21"
   },
   "peerDependencies": {
     "mongodb": "^4.5.0"
diff --git a/packages/rest-client/CHANGELOG.md b/packages/rest-client/CHANGELOG.md
index 19a7c9a5a9..a834674d55 100644
--- a/packages/rest-client/CHANGELOG.md
+++ b/packages/rest-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.
 
+# [5.0.0-pre.21](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.20...v5.0.0-pre.21) (2022-05-23)
+
+**Note:** Version bump only for package @feathersjs/rest-client
+
+
+
+
+
 # [5.0.0-pre.20](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.19...v5.0.0-pre.20) (2022-05-04)
 
 
diff --git a/packages/rest-client/package.json b/packages/rest-client/package.json
index 48af27cbf9..375716826f 100644
--- a/packages/rest-client/package.json
+++ b/packages/rest-client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/rest-client",
   "description": "REST client services for different Ajax libraries",
-  "version": "5.0.0-pre.20",
+  "version": "5.0.0-pre.21",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "types": "lib/",
@@ -53,16 +53,16 @@
   },
   "dependencies": {
     "@feathersjs/commons": "^5.0.0-pre.20",
-    "@feathersjs/errors": "^5.0.0-pre.20",
+    "@feathersjs/errors": "^5.0.0-pre.21",
     "@types/node-fetch": "^3.0.2",
     "@types/superagent": "^4.1.15",
     "qs": "^6.10.3"
   },
   "devDependencies": {
-    "@feathersjs/express": "^5.0.0-pre.20",
-    "@feathersjs/feathers": "^5.0.0-pre.20",
-    "@feathersjs/memory": "^5.0.0-pre.20",
-    "@feathersjs/tests": "^5.0.0-pre.20",
+    "@feathersjs/express": "^5.0.0-pre.21",
+    "@feathersjs/feathers": "^5.0.0-pre.21",
+    "@feathersjs/memory": "^5.0.0-pre.21",
+    "@feathersjs/tests": "^5.0.0-pre.21",
     "@types/mocha": "^9.1.1",
     "@types/node": "^17.0.31",
     "@types/qs": "^6.9.7",
diff --git a/packages/schema/CHANGELOG.md b/packages/schema/CHANGELOG.md
index 14663a292d..91344420ac 100644
--- a/packages/schema/CHANGELOG.md
+++ b/packages/schema/CHANGELOG.md
@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [5.0.0-pre.21](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.20...v5.0.0-pre.21) (2022-05-23)
+
+
+### Bug Fixes
+
+* **schema:** Add Combine helper to allow merging schema types that use ([#2637](https://github.com/feathersjs/feathers/issues/2637)) ([06d03e9](https://github.com/feathersjs/feathers/commit/06d03e91abb1347576c2351c12322d01c58473e5))
+* **typescript:** Make additional types generic to work with extended types ([#2625](https://github.com/feathersjs/feathers/issues/2625)) ([269fdec](https://github.com/feathersjs/feathers/commit/269fdecc5961092dc8608b3cbe16f433c80bfa96))
+
+
+### Features
+
+* **schema:** Add resolveAll hook ([#2643](https://github.com/feathersjs/feathers/issues/2643)) ([85527d7](https://github.com/feathersjs/feathers/commit/85527d71cb78852880696e5d96abdcdf24593934))
+* **schema:** Add resolver for safe external data dispatching ([#2641](https://github.com/feathersjs/feathers/issues/2641)) ([72b980e](https://github.com/feathersjs/feathers/commit/72b980e05631136d30c8f1468dee45ec6a8d2503))
+* **schema:** Add schema resolver converter functionality ([#2640](https://github.com/feathersjs/feathers/issues/2640)) ([26d9e05](https://github.com/feathersjs/feathers/commit/26d9e05327d6e0144466cd57d6fcc11ac7ecb06a))
+
+
+
+
+
 # [5.0.0-pre.20](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.19...v5.0.0-pre.20) (2022-05-04)
 
 
diff --git a/packages/schema/package.json b/packages/schema/package.json
index 1e34057527..c7e4a2e5ad 100644
--- a/packages/schema/package.json
+++ b/packages/schema/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/schema",
   "description": "A common data schema definition format",
-  "version": "5.0.0-pre.20",
+  "version": "5.0.0-pre.21",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "types": "lib/",
@@ -53,8 +53,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@feathersjs/errors": "^5.0.0-pre.20",
-    "@feathersjs/feathers": "^5.0.0-pre.20",
+    "@feathersjs/errors": "^5.0.0-pre.21",
+    "@feathersjs/feathers": "^5.0.0-pre.21",
     "@feathersjs/hooks": "^0.7.4",
     "@types/json-schema": "^7.0.11",
     "ajv": "^8.11.0",
@@ -62,7 +62,7 @@
     "json-schema-to-ts": "^2.3.0"
   },
   "devDependencies": {
-    "@feathersjs/memory": "^5.0.0-pre.20",
+    "@feathersjs/memory": "^5.0.0-pre.21",
     "@types/mocha": "^9.1.1",
     "@types/node": "^17.0.31",
     "ajv-formats": "^2.1.1",
diff --git a/packages/socketio-client/CHANGELOG.md b/packages/socketio-client/CHANGELOG.md
index 8bf4a3bdc6..06404fd494 100644
--- a/packages/socketio-client/CHANGELOG.md
+++ b/packages/socketio-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.
 
+# [5.0.0-pre.21](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.20...v5.0.0-pre.21) (2022-05-23)
+
+**Note:** Version bump only for package @feathersjs/socketio-client
+
+
+
+
+
 # [5.0.0-pre.20](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.19...v5.0.0-pre.20) (2022-05-04)
 
 
diff --git a/packages/socketio-client/package.json b/packages/socketio-client/package.json
index 88d25fa20e..9dbf89f982 100644
--- a/packages/socketio-client/package.json
+++ b/packages/socketio-client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/socketio-client",
   "description": "The client for Socket.io through feathers-socketio",
-  "version": "5.0.0-pre.20",
+  "version": "5.0.0-pre.21",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "types": "lib/",
@@ -53,14 +53,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@feathersjs/transport-commons": "^5.0.0-pre.20"
+    "@feathersjs/transport-commons": "^5.0.0-pre.21"
   },
   "devDependencies": {
     "@feathersjs/commons": "^5.0.0-pre.20",
-    "@feathersjs/feathers": "^5.0.0-pre.20",
-    "@feathersjs/memory": "^5.0.0-pre.20",
-    "@feathersjs/socketio": "^5.0.0-pre.20",
-    "@feathersjs/tests": "^5.0.0-pre.20",
+    "@feathersjs/feathers": "^5.0.0-pre.21",
+    "@feathersjs/memory": "^5.0.0-pre.21",
+    "@feathersjs/socketio": "^5.0.0-pre.21",
+    "@feathersjs/tests": "^5.0.0-pre.21",
     "@types/mocha": "^9.1.1",
     "@types/node": "^17.0.31",
     "mocha": "^10.0.0",
diff --git a/packages/socketio/CHANGELOG.md b/packages/socketio/CHANGELOG.md
index e9158f73d9..428708d4d2 100644
--- a/packages/socketio/CHANGELOG.md
+++ b/packages/socketio/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.
 
+# [5.0.0-pre.21](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.20...v5.0.0-pre.21) (2022-05-23)
+
+**Note:** Version bump only for package @feathersjs/socketio
+
+
+
+
+
 # [5.0.0-pre.20](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.19...v5.0.0-pre.20) (2022-05-04)
 
 
diff --git a/packages/socketio/package.json b/packages/socketio/package.json
index 43a522ecb3..236ff809f1 100644
--- a/packages/socketio/package.json
+++ b/packages/socketio/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/socketio",
   "description": "The Feathers Socket.io real-time API provider",
-  "version": "5.0.0-pre.20",
+  "version": "5.0.0-pre.21",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "types": "lib/",
@@ -53,14 +53,14 @@
   },
   "dependencies": {
     "@feathersjs/commons": "^5.0.0-pre.20",
-    "@feathersjs/feathers": "^5.0.0-pre.20",
-    "@feathersjs/transport-commons": "^5.0.0-pre.20",
+    "@feathersjs/feathers": "^5.0.0-pre.21",
+    "@feathersjs/transport-commons": "^5.0.0-pre.21",
     "socket.io": "^4.5.0"
   },
   "devDependencies": {
-    "@feathersjs/express": "^5.0.0-pre.20",
-    "@feathersjs/memory": "^5.0.0-pre.20",
-    "@feathersjs/tests": "^5.0.0-pre.20",
+    "@feathersjs/express": "^5.0.0-pre.21",
+    "@feathersjs/memory": "^5.0.0-pre.21",
+    "@feathersjs/tests": "^5.0.0-pre.21",
     "@types/mocha": "^9.1.1",
     "@types/node": "^17.0.31",
     "lodash": "^4.17.21",
diff --git a/packages/tests/CHANGELOG.md b/packages/tests/CHANGELOG.md
index 9b38064d44..9919ba12d3 100644
--- a/packages/tests/CHANGELOG.md
+++ b/packages/tests/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.
 
+# [5.0.0-pre.21](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.20...v5.0.0-pre.21) (2022-05-23)
+
+**Note:** Version bump only for package @feathersjs/tests
+
+
+
+
+
 # [5.0.0-pre.20](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.19...v5.0.0-pre.20) (2022-05-04)
 
 
diff --git a/packages/tests/package.json b/packages/tests/package.json
index 58b8a17c63..f13ad1761e 100644
--- a/packages/tests/package.json
+++ b/packages/tests/package.json
@@ -2,7 +2,7 @@
   "name": "@feathersjs/tests",
   "private": true,
   "description": "Feathers core module common tests",
-  "version": "5.0.0-pre.20",
+  "version": "5.0.0-pre.21",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "types": "lib/",
@@ -48,7 +48,7 @@
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@feathersjs/feathers": "^5.0.0-pre.20",
+    "@feathersjs/feathers": "^5.0.0-pre.21",
     "@types/axios": "^0.14.0",
     "@types/mocha": "^9.1.1",
     "@types/node": "^17.0.31",
diff --git a/packages/transport-commons/CHANGELOG.md b/packages/transport-commons/CHANGELOG.md
index b65132fcce..b343c29c45 100644
--- a/packages/transport-commons/CHANGELOG.md
+++ b/packages/transport-commons/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.
 
+# [5.0.0-pre.21](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.20...v5.0.0-pre.21) (2022-05-23)
+
+**Note:** Version bump only for package @feathersjs/transport-commons
+
+
+
+
+
 # [5.0.0-pre.20](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.19...v5.0.0-pre.20) (2022-05-04)
 
 
diff --git a/packages/transport-commons/package.json b/packages/transport-commons/package.json
index f7514b4f25..f435e6de3a 100644
--- a/packages/transport-commons/package.json
+++ b/packages/transport-commons/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/transport-commons",
   "description": "Shared functionality for websocket providers",
-  "version": "5.0.0-pre.20",
+  "version": "5.0.0-pre.21",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "types": "lib/",
@@ -54,8 +54,8 @@
   ],
   "dependencies": {
     "@feathersjs/commons": "^5.0.0-pre.20",
-    "@feathersjs/errors": "^5.0.0-pre.20",
-    "@feathersjs/feathers": "^5.0.0-pre.20",
+    "@feathersjs/errors": "^5.0.0-pre.21",
+    "@feathersjs/feathers": "^5.0.0-pre.21",
     "encodeurl": "^1.0.2",
     "lodash": "^4.17.21"
   },