DEV: Improvements to Drupal script (PR #10016)

GitHub