UIO4689-5741

Enforced returns