OOT3611-1047

Enforced returns