RIG2406-3735

Enforced returns