Merge #9298 fix.