Merge base/movie changes from the "tv" branch

Cherry-picked all the changes from "tv" which can be included in the "develop" branch.