CFS8067-6774

Enforced returns