FSP3579-5584

Enforced returns