Merge #7198 doc fix.