JIR0953-8665

Enforced returns