Issue #3344795: Drupal 10 fixes

Jonathan Hedstrom requested to merge issue/doc_serialization-3344795:3344795-drupal-10-fixes into 8.x-3.x Feb 27, 2023