Merge "Add transaction tracing support, fix device id regex."