Edit Device #1935