Fix/update the backfiller
The backfiller has not been updated to match recent changes in several places. This has not been detected because there was no proper test of the backfiller function as a whole. This is now done.
Migrated from D3299 (view on Phabricator)