GMN8294-4306

Enforced returns