NBL4480-1383

Enforced returns