Merge tag 'v3.11-rc7' into devel