Merge branch 'v3.2-rc7' into next/pm