Merge pull request #2923 from tnull/2024-03-improve-best-block