Merge "TIF: Remove redundant modifiers in TvContract" into oc-dev