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