Merge tag 'v3.10.94' into update