Merge pull request #818 from jkczyz/2021-03-validate-best-block-header