Merge "Add more logs for debugging"