Merge pull request #190 from chrstphrchvz/backport-63438

Backport fix for bz-63438 to 1.9.x