Merge "Add more logs"