D10 compatibility fix

Urvashi Vorarequested to merge
issue/cool_message-3341182:cool-message-3341182 into 3.0.x

Merge request reports