TSN4097-2788

Enforced returns