Merge commit 'fe744ad58e4' into kernel