3 Commits (feature/4426-tf-fixes)