Workers form defense squads again
Merge branch 'dev'