Merge "Add more helpful debug information"