Bug(s) in "setting initiative just before current combatant" when NPCs are included

[MothMariner]

workbench version 6.7.16 updated to 6.7.18 and still a bug
pathfinder2e version 6.2.1
foundry v12.330

The World Automation Settings option -
"setting initiative to just before the current combatant: When character or npc combatant reaches 0 HP"
is not working properly.

Bug 1 (lesser): It moves the 0 HP token to just before the current initiative, NOT just before the current combatant (meaning if multiple tokens share the same initiative, it moves them before ALL the tokens, not the one that did the damage).

Bug 2 (greater): It shifts active initiative to the slot one before the current combatant, rather than staying on the combatant. It does this however many places it has moved the 0 HP token back to.

Video of both effects being reproduced in a fresh world:

bug-npc-0-hp-initiative.mp4