PR #6807

PR #6807 is not in the merge queue.