JCN6386-1850

Enforced returns