Merge tag 'v6.0-rc6' into locking/core, to refresh the branch