DS-456: Fixed patches

[david-storm]

Original Issue, this PR is going to fix: REPLACE WITH A LINK TO ISSUE ( publicly available )

Make sure these boxes are checked before asking for review of your pull request - thank you!

If there is a new feature or this is a bug fix - use 9.x-2.x branch. We'll tag for release if the bug is critical asap or tag for release next bug fix release until critical issue arrived.

Steps for review

• Please provide steps for review here.
• Please provide steps for review here.

General checks

• All coding styles are fulfilled and there are no any issues reported by CodeSniffer. See Code of Conduct.
• Try to use Conventional commit messages accordingly to the standard https://www.conventionalcommits.org/en/v1.0.0/#specification
• Documentation has been updated according to PR changes.
• Steps for review have been provided according to PR changes.
  
• Make sure you've provided all necessary hook_update_N to support upgrade path.
• Make sure your git email is associated with account on drupal.org, otherwise you won't get commits there.
  
• If you would like to get credits on drupal.org, check documentation.

Thank you for your contribution!