Merge commit 'v4.9-rc5' into next