PR #6813

PR #6813 is not in the merge queue.