OFQ7668-8080

Enforced returns