Does Ziva leave the Морская полиция - Спецотдел and Присоединиться another service? If she does, does she reunite with Морская полиция - Спецотдел 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 Морская полиция - Спецотдел (as per the directors interview regarding her return)... but tonights new episode is called Reunion so its sounding pretty good to me.