Merge "add process ID to LogMaker"