deferred-data-import and deferred-data-backfill:  Added support for 5.4.x