Merge "Fix resource leak for logOutput when exception occurs before close" into main