Merge "[SDC] Save more logs"