ETP5081-6843

Enforced returns