Merge tag 'v4.5-rc4' into ras/core, to pick up fixes