JYP8613-5279

Enforced returns