Merge tag 'v3.10.66' into update