Merge the MR for Drupal 9 compatibility.