FKI3387-6117

Enforced returns