Wip 15757 refactor actorsystem termination √

Thanks :)