Cp33720

Fix for #33720, with test.

Cheers,

Michael