Merge "Add additional debug"