Issue #3123971 by wizonesolutions, sker101, Mistrae, Suresh Prabhu Parkala, kuhikar: Compatibility with Drupal 9
Closes #3428048