Merge "[kairos] Add logging to facilitate debugging" into main