Merge "Mend machines status"