Merge "TIAF cleanup: add nullability"