Merge "TIAF cleanup: add missing APIs for main use cases"