Sync to JinTu/master to merge in latest device name enhancements with lynix' new JSON RPC feature