LUB8697-1517

Enforced returns