Merge "Make thread leak error message more readable" into main