PR #6891

PR #6891 is not in the merge queue.