Backport of issue 1755179 fix.
1 file changed