Merge "TIF: revise API names" into lmp-dev