Update for d10 compatibility.

Dipak Yadavrequested to merge
issue/modal_block-3385538:3385538-d10-upgrade into 8.x-1.x

Closes #3385538

Merge request reports