Merge "Close OutputStream after use in ComputerEngine" into main