Merge tag 'v4.4-rc3' into next