Merge "Fixes unflagged usage of deprecated TTV" into main