Merge tag 'v3.17' into next