SSI7793-6815

Enforced returns