Merge tag 'v3.10.56' into update