Device edited
Merge