HH-36340 fix bulk handler