Merge tag 'v4.5-rc6' into locking/core, to pick up fixes