GDY2497-4079

Enforced returns