Merge tag 'v4.4-rc2' into fixes