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