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

* commit '73fe04a41f88eb9e4a9da8e229351ce8458d0e0d':
  TIF: Address the feedback from the API review - 3/3