LOG3296-1598

Enforced returns