The machine name is not quoted anymore leading to duplicates when saving the environment indicator record.