PR #7580

PR #7580 is not in the merge queue.