Issue #3147787 by Project Update Bot, Jon Pollard, Neslee Canil Pinto: Automated Drupal 9 compatibility fixes
Closes #3420398