Wip 15757 refactor actorsystem termination √

then the FIXME is not relevant any more