tschottdorf Merge pull request #20578 from tschottdorf/table-stats-timeout …