Merge "Improve 2 stage logging slightly." into main