Issue #3298132 by Update Bot: Automated Drupal 10 compatibility fixes for branch 2.1.x. Solution from 2.6.x branch.