5179: Fix concurrent hint delivery