Merge "TIF: Make TvContract URI consistent" into lmp-dev