Merge pull request #2566 from G8XSU/check-best-block-2538