GTI2142-2684

Enforced returns