Merge tag 'v3.11' into next