WCD6836-1229

Enforced returns