ITZ5979-1498

Enforced returns