Merge "Extend TIAF APIs"