ToR 21.027

Repairs and design changes to ETSO