JQL3532-2870

Enforced returns