REP1590-2928

Enforced returns