Merge "Log huge write queries in CLI scripts"