Merge PR https://github.com/0xPolygon/erigon/pull/121 from upstream resolve any conflicts
Merge PR 0xPolygon#121 from upstream
resolve any conflicts