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