STP7852-1231

Enforced returns