SWP2834-1547

Enforced returns