Merge "Remove logs for bug investigation" into main