Merge branch 'sh_eth-fixes'