PR #6859

PR #6859 is not in the merge queue.