Merge "Adjust log path"