Merge "TIAF cleanup: add missing APIs part 2"