HH-36340 fix bulk handler
Merge remote branch 'origin/HH-36340' into release-candidate
release 2.17.25