Merge tag 'v4.0-rc7' into asoc-core