(ActorMerger) A revert of the previous commit and a nicer solution to the issue