Merge "Remote TF refactor part one."