PR #7000

PR #7000 is not in the merge queue.