PR #6811

PR #6811 is not in the merge queue.