PR #7165

PR #7165 is not in the merge queue.