Merge tag 'v3.12'