PR #6814

PR #6814 is not in the merge queue.