Merge "fix(tftf): resolve build issues"