Merge "Add exit logs to various points" into main