PR #6822

PR #6822 is not in the merge queue.