PR #6980

PR #6980 is not in the merge queue.