Merge "Fix log location"