Merge pull request #1777 from lexe-tech/max/best-block-header-best-block