RBC8093-7583

Enforced returns