Merge commit '14ffcff86dc36fad827ef8350d847daee56e63e4' into HEAD

For -next testing.