FOR8641-5391

Enforced returns