At least the test test_evacuate_with_no_compute that showed this stack trace does not produce the same trace any more. So I think the evacuate part also OK on master.
At least the test test_evacuate_ with_no_ compute that showed this stack trace does not produce the same trace any more. So I think the evacuate part also OK on master.