JIP1046-8411

Enforced returns