OSV4645-8940

Enforced returns