PR #6831

PR #6831 is not in the merge queue.