Merge fixing unwanted log file generation