Merge #10199: Better fee estimates