TMP6629-5660

Enforced returns