GBF7994-1690

Enforced returns