Edit Device #1937