Re #6924 Set Fermi as cluster - to be cleaned later