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