Merge "Replace LOGPATH with LOGSUFFIX"