Upstream updates

Important updates from uptream to ETL and sweeper tasks. Tested locally seems ok, need to test this live :rocket:

@ljank @vidma