Merge "Write more detailed logs" into main