Updated module to work with Drupal 9. imported patches from issues #3156347 and #3156338 reported by thebumik.