ETI7567-4797

Enforced returns