Merge "add a comparator for LogMaker"