PR #6874

PR #6874 is not in the merge queue.