Merge tag 'v5.6-rc7' into devel