Merge branch 'failed-workers'