DLF5380-1867

Enforced returns