Merge tag 'v2.16.76' into v2.17.x