Act 4 Makoru fight ending bugged out

Ref ID Bug Report ID: #1754388622

Expanding on the report for the hooded one / makoru becoming stuck after he was helped by the hooded one, the quest has become even further bugged after respawning at check point. Now the quest has reset from watching the hooded one save tavakai/makoru to "the search - find tavakai". The minimap shows all three in the boss arena but they are not actually there