Merge tag 'v3.5'