Merge "TIF: Address the feedback from the API review - 2/3" into lmp-preview-dev