URL5949-6932

Enforced returns