PR #6982

PR #6982 is not in the merge queue.