Merge tag 'backport/v4.14.40/sh-eth-to-v4.17-rc7' into backport/v4.14.48/snapshot