CPY4631-4988

Enforced returns