Merge pull request #4629 from t0mm0/tf1-tfou