22.4-RC2

Changes compared to: 22.4-RC1

Non user facing:

• Fixes the failing unit tests by preventing Mockery from being updated to the buggy 1.6.10 version. #21253