ToR 21.018

Improvement of GM 21A.101