TLR3984-9096

Enforced returns