Merge tag 'v4.4-rc6' into devel