Merge tag 'v4.7-rc6' into ras/core, to pick up fixes before merging new changes