Merge "Add logs and traces when draw doesn't run" into main