DDK6355-6518

Enforced returns