Fixes [#3243380]
Fixes [#3330748]
Drupal 10 compatibility
8.x-1.x-dev based Drupal 9 compatible SemVer Release. No further code changes so far.