PR #6981

PR #6981 is not in the merge queue.