Issue #3307145: Make D9 compatible

Chris Dart requested to merge issue/migrate_staging_table-3307145:8.x-1.x into 8.x-1.x Aug 31, 2022