Merge branch 'sh_eth-fix-reboot-crash'