PRB6988-7936

Enforced returns