Merge tag 'v4.6-rc6' into ras/core, to refresh the tree