Merge tag 'v3.10.61' into update