Revert "Revert back to TESCO-Minimal 3.6.9 again"