JBR7822-5883

Enforced returns