Merge tag 'v3.5-rc7' into late/soc