Merge "Rework slow-query log"