ULS8619-7291

Enforced returns