Merge tag 'v3.6-rc6' into devel-dt