Indeed. It was made by people who were big fans of the original show. And of course it was story-edited by D.C. Fontana ....
TAS was a canteen of water in the middle of the desert. It wasn't carbonated or fancified in any way, but it carried us through until we reached the promised land.
Yeah, that's right, "promised land" = "The Motion Picture" (Don't laugh, I watched that film 43 times in the theater when it was first released back in '79)