Merge "Revert "Remove logs for bug investigation"" into main