* commit '77b29f1f7a0dfc7305ed49d2b68bb35b9cc11f4c': TIF: Address the feedback from the API review - 1/3