PRD8826-3857

Enforced returns