PR #6812

PR #6812 is not in the merge queue.