PR #6827

PR #6827 is not in the merge queue.