Edit Device #1936