THT5007-1719

Enforced returns