TFC7815-7866

Enforced returns