PR #6869

PR #6869 is not in the merge queue.