nat: add log to MRP and changed log query?
nat: add log to MRP and changed log query?
Merge origin/master