Merge tag 'v1.8.98' into v1.9.x