PR #6834

PR #6834 is not in the merge queue.