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

* commit '1a4d3d02f32ba5e50f2b0da9058dedfbd6342ef9':
  TIF: Address the feedback from the API review - 2/3