diff --git a/substrate/.maintain/gitlab/check_polkadot_companion_build.sh b/substrate/.maintain/gitlab/check_polkadot_companion_build.sh
index f2b61c6192..9e412ce26a 100755
--- a/substrate/.maintain/gitlab/check_polkadot_companion_build.sh
+++ b/substrate/.maintain/gitlab/check_polkadot_companion_build.sh
@@ -41,8 +41,6 @@ EOT
 git config --global user.name 'CI system'
 git config --global user.email '<>'
 
-cargo install -f --version 0.2.0 diener
-
 # Merge master into our branch before building Polkadot to make sure we don't miss
 # any commits that are required by Polkadot.
 git fetch --depth 100 origin
@@ -88,7 +86,7 @@ else
 fi
 
 cd ..
-$CARGO_HOME/bin/diener --substrate --branch $CI_COMMIT_REF_NAME --git https://gitlab.parity.io/parity/substrate.git --path polkadot
+diener --substrate --branch $CI_COMMIT_REF_NAME --git https://gitlab.parity.io/parity/substrate.git --path polkadot
 cd polkadot
 
 # Test Polkadot pr or master branch with this Substrate commit.
diff --git a/substrate/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr b/substrate/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
index e366061b1c..86968221cf 100644
--- a/substrate/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/call_argument_invalid_bound_2.stderr
@@ -3,9 +3,48 @@ error[E0277]: the trait bound `pallet::Call<T>: Decode` is not satisfied
    |
 17 |     #[pallet::call]
    |               ^^^^ the trait `Decode` is not implemented for `pallet::Call<T>`
+   |
+  ::: $WORKSPACE/frame/support/src/dispatch.rs
+   |
+   |     type Call: UnfilteredDispatchable + Codec + Clone + PartialEq + Eq;
+   |                                         ----- required by this bound in `frame_support::Callable::Call`
 
 error[E0277]: the trait bound `pallet::Call<T>: pallet::_::_parity_scale_codec::Encode` is not satisfied
   --> $DIR/call_argument_invalid_bound_2.rs:17:12
    |
 17 |     #[pallet::call]
    |               ^^^^ the trait `pallet::_::_parity_scale_codec::Encode` is not implemented for `pallet::Call<T>`
+   |
+  ::: $WORKSPACE/frame/support/src/dispatch.rs
+   |
+   |     type Call: UnfilteredDispatchable + Codec + Clone + PartialEq + Eq;
+   |                                         ----- required by this bound in `frame_support::Callable::Call`
+
+error[E0369]: binary operation `==` cannot be applied to type `&<T as pallet::Config>::Bar`
+  --> $DIR/call_argument_invalid_bound_2.rs:20:37
+   |
+20 |         fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
+   |                                           ^
+   |
+help: consider further restricting this bound
+   |
+17 |     #[pallet::call + std::cmp::PartialEq]
+   |                    ^^^^^^^^^^^^^^^^^^^^^
+
+error[E0277]: the trait bound `<T as pallet::Config>::Bar: Clone` is not satisfied
+  --> $DIR/call_argument_invalid_bound_2.rs:20:37
+   |
+20 |         fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
+   |                                           ^ the trait `Clone` is not implemented for `<T as pallet::Config>::Bar`
+   |
+   = note: required by `clone`
+
+error[E0277]: `<T as pallet::Config>::Bar` doesn't implement `std::fmt::Debug`
+  --> $DIR/call_argument_invalid_bound_2.rs:20:37
+   |
+20 |         fn foo(origin: OriginFor<T>, bar: T::Bar) -> DispatchResultWithPostInfo {
+   |                                           ^ `<T as pallet::Config>::Bar` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
+   |
+   = help: the trait `std::fmt::Debug` is not implemented for `<T as pallet::Config>::Bar`
+   = note: required because of the requirements on the impl of `std::fmt::Debug` for `&<T as pallet::Config>::Bar`
+   = note: required for the cast to the object type `dyn std::fmt::Debug`
diff --git a/substrate/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr b/substrate/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr
index f8ba5ecdc2..d8c62faa30 100644
--- a/substrate/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/store_trait_leak_private.stderr
@@ -5,4 +5,4 @@ error[E0446]: private type `_GeneratedPrefixForStorageFoo<T>` in public interfac
    |                                        ^^^^^ can't leak private type
 ...
 20 |     #[pallet::storage]
-   |               - `_GeneratedPrefixForStorageFoo<T>` declared as private
+   |               ------- `_GeneratedPrefixForStorageFoo<T>` declared as private
diff --git a/substrate/primitives/api/test/tests/ui/mock_only_one_error_type.stderr b/substrate/primitives/api/test/tests/ui/mock_only_one_error_type.stderr
index eccd80ecd8..ab5b90af3a 100644
--- a/substrate/primitives/api/test/tests/ui/mock_only_one_error_type.stderr
+++ b/substrate/primitives/api/test/tests/ui/mock_only_one_error_type.stderr
@@ -19,7 +19,7 @@ error[E0277]: the trait bound `u32: From<sp_api_hidden_includes_DECL_RUNTIME_API
    ::: $WORKSPACE/primitives/api/src/lib.rs
     |
     |     type Error: std::fmt::Debug + From<ApiError>;
-    |                                   -------------- required by this bound in `ApiErrorExt`
+    |                                   -------------- required by this bound in `sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ApiErrorExt::Error`
     |
     = help: the following implementations were found:
               <u32 as From<HttpError>>