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