CSB7994-4338

Enforced returns