CDS7086-5612

Enforced returns