Closes #3346401
Updated for Drupal 11 (please note, I was unable to delete previous un-rebased branches)