Backport #15006 DV merge fix to 1.10.x branch

[amogh-jahagirdar]

backport #15006 to 1.10.x in preparation for a 1.10.2 patch release

[ebyhr]

It looks like #15654 did not automatically close this issue as expected.