Merge "Fix fd leak in clatStart() by closing in finally block" into main