Merge "Add more logging." into main