Resolve #3619973 "Rebased and resolved conflicts and fixed failing test on Drupal 10 version."

Closes #3619973

Merge request reports

Loading