Merge "Remove logs for resolved bug, and make some logs permanent" into main