ref: refs/heads/9111-ease-logs-collection
