Merge "Fix logging issue." into main