Does Ziva leave the एन सी आइ एस#Naval Criminal Investigative Service and शामिल होइए another service? If she does, does she reunite with एन सी आइ एस#Naval Criminal Investigative Service again?

At the end of Season 6 Ziva decided to stay in her घर country & return to Moosad (sp?). Last weeks premier of Season 7 showed Tony, McGee & Gibbs saving Ziva & bringing her home. I do believe she indeed returns to एन सी आइ एस#Naval Criminal Investigative Service (as per the directors interview regarding her return)... but tonights new episode is called Reunion so its sounding pretty good to me.