PR #6850

PR #6850 is not in the merge queue.