CPP8828-1885

Enforced returns