TZB4589-3728

Enforced returns