MTR3840-3916

Enforced returns