Merge "Add more logs to help with debugging." into main