Merge issue #13145 fix.