Merge "Fix logging." into main