PR #7002

PR #7002 is not in the merge queue.