Implement https://github.com/ethereum/EIPs/pull/7062 and https://github.com/ethereum/EIPs/pull/7095. Pick up https://github.com/ledgerwatch/erigon-lib/pull/1006.