Merge pull request #7101 from dannil/mod-status-poll-logs