Issue #20167: revise condition to accomodate message change.
Merge with 3.4