DSO7628-2557

Enforced returns